Merge pull request #14 from Milo123459/update-workflow

Update workflows
dimensionhq · Apr 23, 2022 · 65d5a82 · 65d5a82
2 parents 16c49f2 + 2590707
commit 65d5a82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 33 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -30,26 +30,13 @@ jobs:
           version: latest
           platform: x64
 
-
-      - name: Cache .cargo/bin
-        uses: actions/cache@v3
-
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.cargo/bin
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+      - uses: Swatinem/rust-cache@v1
 
       - name: Install sccache        
-        run: if [ -e ~/.cargo/bin/sccache ] ; then echo "Sccache is already installed"; else cargo install sccache; fi
+        run: if [ -e ~/.cargo/bin/sccache ] ; then echo "Sccache is already installed"; else cargo install sccache -f; fi
 
       - name: Install fleet
-        run: if [ -e ~/.cargo/bin/fleet ] ; then echo "Fleet is already installed"; else cargo install fleet-rs; fi
+        run: if [ -e ~/.cargo/bin/fleet ] ; then echo "Fleet is already installed"; else cargo install fleet-rs -f; fi
 
       - name: Run app using fleet
-        run: fleet run --bin fleet
+        run: fleet build --bin fleet
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,24 +24,13 @@ jobs:
           components: clippy
           override: true
 
-      - name: Cache ~/.cargo/bin
-        uses: actions/cache@v3
-
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.cargo/bin
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+      - uses: Swatinem/rust-cache@v1
+
       - name: Install sccache        
-        run: if (Test-Path -Path ~\.cargo\bin\sccache.exe -PathType Leaf) {echo "Sccache is already installed"} else { cargo install sccache }
+        run: if (Test-Path -Path ~\.cargo\bin\sccache.exe -PathType Leaf) {echo "Sccache is already installed"} else { cargo install sccache -f }
 
       - name: Install fleet
-        run: if (Test-Path -Path ~\.cargo\bin\fleet.exe -PathType Leaf) {echo "Fleet is already installed"} else { cargo install fleet-rs }
+        run: if (Test-Path -Path ~\.cargo\bin\fleet.exe -PathType Leaf) {echo "Fleet is already installed"} else { cargo install fleet-rs -f }
 
       - name: Run app using fleet
-        run: fleet run --bin fleet
+        run: fleet build --bin fleet