Merge #1309

1309: Update GitHub Actions r=jhelwig a=jhelwig There are updated versions that make some of the artifact handling more straightforward. The official release creation action is also deprecated, in favor of a community created one that also handles release artifact creation at the same time. Co-authored-by: Jacob Helwig <[email protected]>
Technosorcery · Jan 25, 2023 · 0c6e122 · 0c6e122
2 parents 16cd51d + 1873ab6
commit 0c6e122
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 152 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -18,17 +18,17 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 16.13.1
+          - 18.13.0
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.3.0
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.5.0
+        uses: actions/setup-node@v3.6.0
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'npm'
+          cache: "npm"
           cache-dependency-path: ui/package-lock.json
       - name: Install
         run: |
@@ -38,7 +38,7 @@ jobs:
         run: |
           cd ui
           npm run build
-      - uses: actions/upload-artifact@v2.3.1
+      - uses: actions/upload-artifact@v3.1.2
         with:
           name: ui-dist
           path: ui/dist/
@@ -58,8 +58,8 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2.4.0
-      - uses: actions/download-artifact@v2.1.0
+      - uses: actions/checkout@v3.3.0
+      - uses: actions/download-artifact@v3.0.2
         with:
           name: ui-dist
           path: ui/dist
@@ -68,7 +68,7 @@ jobs:
         with:
           profile: minimal
           override: true
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3.2.3
         name: Cache cargo
         with:
           path: |
@@ -90,32 +90,28 @@ jobs:
           args: --verbose
         env:
           SKIP_UI_BUILD: true
-      - name: Upload debug artifact (Windows)
-        if: matrix.os == 'windows-latest'
-        uses: actions/[email protected]
-        with:
-          name: debug_${{ matrix.os }}
-          path: target/debug/sd2snes-lttp-rando-tracker.exe
       - name: Upload debug artifact
-        if: matrix.os != 'windows-latest'
-        uses: actions/[email protected]
+        uses: actions/[email protected]
         with:
           name: debug_${{ matrix.os }}
-          path: target/debug/sd2snes-lttp-rando-tracker
+          path: |
+            target/debug/sd2snes-lttp-rando-tracker*
+            !**/*.d
+            !**/*.pdb
 
   rustfmt-check:
     name: Check rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.3.0
       - name: Install Rust nightly
         uses: actions-rs/[email protected]
         with:
           profile: minimal
           components: rustfmt
           toolchain: nightly
           override: true
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3.2.3
         name: Cache cargo
         with:
           path: |
@@ -135,13 +131,13 @@ jobs:
     name: Check cargo clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.3.0
       - name: Install Rust
         uses: actions-rs/[email protected]
         with:
           override: true
           components: clippy
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3.2.3
         name: Cache cargo
         with:
           path: |
@@ -171,5 +167,5 @@ jobs:
   cargo-deny:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: EmbarkStudios/cargo-deny-action@v1
+      - uses: actions/checkout@v3.3.0
+      - uses: EmbarkStudios/cargo-deny-action@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,155 +2,122 @@ name: Release
 on:
   push:
     tags:
-    - v*
+      - v*
 jobs:
   create-release:
     name: Create draft release
     needs:
-    - rust-app
+      - rust-app
     runs-on: ubuntu-latest
     steps:
-    - name: Download Linux binary
-      uses: actions/download-artifact@v2
-      with:
-        name: app_ubuntu-latest
-        path: app/ubuntu
-    - name: Create Linux Release Artifact
-      run: |
-        tar -czvf sd2snes-lttp-rando-tracker-linux-release.tar.gz -C app/ubuntu .
-    - name: Download Windows binary
-      uses: actions/download-artifact@v2
-      with:
-        name: app_windows-latest
-        path: app/windows
-    - name: Create Windows Release Artifact
-      run: |
-        zip --junk-paths sd2snes-lttp-rando-tracker-windows-release.zip app/windows/sd2snes-*
-    - name: Download macOS binary
-      uses: actions/download-artifact@v2
-      with:
-        name: app_macOS-latest
-        path: app/macos
-    - name: Create MacOS Release Artifact
-      run: |
-        tar -czvf sd2snes-lttp-rando-tracker-macos-release.tar.gz -C app/macos .
-    - name: Create release
-      id: create_release
-      uses: actions/[email protected]
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: ${{ github.ref }}
-        draft: true
-        prerelease: false
-    - name: Upload Linux Release Asset
-      uses: actions/[email protected]
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./sd2snes-lttp-rando-tracker-linux-release.tar.gz
-        asset_name: sd2snes-lttp-rando-tracker-linux-${{ github.ref }}-release.tar.gz
-        asset_content_type: application/gzip
-    - name: Upload Windows Release Asset
-      uses: actions/[email protected]
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./sd2snes-lttp-rando-tracker-windows-release.zip
-        asset_name: sd2snes-lttp-rando-tracker-windows-${{ github.ref }}-release.zip
-        asset_content_type: application/zip
-    - name: Upload MacOS Release Asset
-      uses: actions/[email protected]
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./sd2snes-lttp-rando-tracker-macos-release.tar.gz
-        asset_name: sd2snes-lttp-rando-tracker-macos-${{ github.ref }}-release.tar.gz
-        asset_content_type: application/gzip
+      - name: Download Linux binary
+        uses: actions/[email protected]
+        with:
+          name: app_ubuntu-latest-app
+          path: app/ubuntu
+      - name: Create Linux Release Artifact
+        run: |
+          tar -czvf sd2snes-lttp-rando-tracker-linux-release.tar.gz -C app/ubuntu .
+      - name: Download Windows binary
+        uses: actions/[email protected]
+        with:
+          name: app_windows-latest
+          path: app/windows
+      - name: Create Windows Release Artifact
+        run: |
+          zip --junk-paths sd2snes-lttp-rando-tracker-windows-release.zip app/windows/sd2snes-*
+      - name: Download macOS binary
+        uses: actions/[email protected]
+        with:
+          name: app_macOS-latest
+          path: app/macos
+      - name: Create macOS Release Artifact
+        run: |
+          tar -czvf sd2snes-lttp-rando-tracker-macos-release.tar.gz -C app/macos .
+      - name: Create release
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          prerelease: false
+          files: |
+            sd2snes-*-release.*
 
   web-ui:
     name: Vue.js app
     strategy:
       matrix:
         node-version:
-        - 16.13.1
+          - 18.13.0
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.5.0
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-        cache-dependency-path: ui/package-lock.json
-    - name: Install
-      run: |
-        cd ui
-        npm install
-    - name: Build
-      run: |
-        cd ui
-        npm run build
-    - uses: actions/upload-artifact@v2.3.1
-      with:
-        name: ui-dist
-        path: ui/dist
+      - uses: actions/checkout@v3.3.0
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3.6.0
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "npm"
+          cache-dependency-path: ui/package-lock.json
+      - name: Install
+        run: |
+          cd ui
+          npm install
+      - name: Build
+        run: |
+          cd ui
+          npm run build
+      - uses: actions/upload-artifact@v3.1.2
+        with:
+          name: ui-dist
+          path: ui/dist
 
   rust-app:
     name: Rust app
     needs:
-    - web-ui
+      - web-ui
     strategy:
       matrix:
         os:
-        - ubuntu-latest
-        - windows-latest
-        - macOS-latest
+          - ubuntu-latest
+          - windows-latest
+          - macOS-latest
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/[email protected]
-    - uses: actions/[email protected]
-      with:
-        name: ui-dist
-        path: ui/dist
-    - name: Install Rust
-      uses: actions-rs/[email protected]
-      with:
-        profile: minimal
-        override: true
-    - uses: actions/[email protected]
-      name: Cache cargo
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-    - name: Test
-      uses: actions-rs/[email protected]
-      with:
-        command: test
-        args: --verbose
-    - name: Build
-      uses: actions-rs/[email protected]
-      with:
-        command: build
-        args: --verbose --release
-    - name: Upload release artifact (Windows)
-      if: matrix.os == 'windows-latest'
-      uses: actions/[email protected]
-      with:
-        name: app_${{ matrix.os }}
-        path: target/release/sd2snes-lttp-rando-tracker.exe
-    - name: Upload release artifact
-      if: matrix.os != 'windows-latest'
-      uses: actions/[email protected]
-      with:
-        name: app_${{ matrix.os }}
-        path: target/release/sd2snes-lttp-rando-tracker
+      - uses: actions/[email protected]
+      - uses: actions/[email protected]
+        with:
+          name: ui-dist
+          path: ui/dist
+      - name: Install Rust
+        uses: actions-rs/[email protected]
+        with:
+          profile: minimal
+          override: true
+      - uses: actions/[email protected]
+        name: Cache cargo
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Test
+        uses: actions-rs/[email protected]
+        with:
+          command: test
+          args: --verbose
+      - name: Build
+        uses: actions-rs/[email protected]
+        with:
+          command: build
+          args: --verbose --release
+      - name: Upload release artifact
+        uses: actions/[email protected]
+        with:
+          name: app_${{ matrix.os }}
+          path: |
+            target/release/sd2snes-lttp-rando-tracker*
+            !**/*.d
+            !**/*.pdb