Merge branch 'master' of https://github.com/SuperCuber/dotter

dead10ck · May 25, 2021 · c92b98e · c92b98e
2 parents cd6aa7b + 2965269
commit c92b98e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 410 deletions.
diff --git a/.github/workflows/build-for-release.yml b/.github/workflows/build-for-release.yml
@@ -10,18 +10,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        handlebars_misc_helpers: ["--features handlebars_misc_helpers", ""]
         include:
           - os: ubuntu-latest
             exe_suffix: ""
             target: x86_64-unknown-linux-musl
           - os: windows-latest
             exe_suffix: ".exe"
             target: x86_64-pc-windows-msvc
-          - handlebars_misc_helpers: ""
-            name_suffix: "-simple"
-          - handlebars_misc_helpers: "--features handlebars_misc_helpers"
-            name_suffix: ""
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -35,14 +30,14 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --release --locked --verbose ${{ matrix.handlebars_misc_helpers }} --target ${{ matrix.target }}
+          args: --release --locked --verbose --target ${{ matrix.target }}
       - name: Upload asset
         uses: actions/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           asset_path: target/${{ matrix.target }}/release/dotter${{ matrix.exe_suffix }}
-          asset_name: dotter${{ matrix.name_suffix }}${{ matrix.exe_suffix }}
+          asset_name: dotter${{ matrix.exe_suffix }}
           asset_content_type: application/octet-stream
           upload_url: ${{ github.event.release.upload_url }}
   cargo-publish:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -9,7 +9,6 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        handlebars_misc_helpers: ["--features handlebars_misc_helpers", ""]
         include:
           - os: windows-latest
             target: x86_64-pc-windows-msvc
@@ -20,18 +19,18 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
-      #- uses: actions-rs/toolchain@v1
-       # with:
-        #  profile: minimal
-         # toolchain: stable
-          #target: ${{ matrix.target }}
-          #override: true
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: ${{ matrix.target }}
+          override: true
       - name: Cache dependencies
         uses: Swatinem/rust-cache@v1
-      - uses: zhxiaogg/cargo-static-build@v1.41.1-1
+      - uses: actions-rs/cargo@v1
         with:
           command: check
-          args: --verbose --locked --target ${{ matrix.target }} ${{ matrix.handlebars_misc_helpers }} 
+          args: --verbose --locked --target ${{ matrix.target }}
   check-readme:
     name: Check README
     runs-on: ubuntu-latest