diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fe6dbd86a..63a6796ef 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: toolchain: - stable steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} - uses: Swatinem/rust-cache@v2 - run: cargo fmt --check @@ -30,7 +30,7 @@ jobs: toolchain: - stable steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} - uses: Swatinem/rust-cache@v2 - run: cargo clippy --all-targets --all-features @@ -44,7 +44,7 @@ jobs: toolchain: - stable steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} - uses: Swatinem/rust-cache@v2 - run: cargo test --verbose @@ -58,7 +58,7 @@ jobs: toolchain: - stable steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} - uses: Swatinem/rust-cache@v2 - run: cargo build --verbose --release @@ -66,7 +66,6 @@ jobs: uses: actions/upload-artifact@v4 with: name: pumpkin-${{ matrix.os }} - path: ./ compression-level: 9 path: target/release/pumpkin* clippy_release: @@ -77,7 +76,7 @@ jobs: toolchain: - stable steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} - uses: Swatinem/rust-cache@v2 - run: cargo clippy --release --all-targets --all-features @@ -92,7 +91,7 @@ jobs: NIGHTLY_REPO: ${{ github.repository_owner }}/pumpkin-commit-builds steps: - name: Checkout the repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Creates a draft release for the current commit - name: Create Draft GitHub Release id: create-release @@ -119,42 +118,29 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.COMMIT_REPO_TOKEN }} - # Download and upload the Linux artifact - - name: Download Linux executable + - name: Download all executables uses: actions/download-artifact@v5 with: - name: pumpkin-ubuntu-latest - path: ./ + path: pumpkin + pattern: pumpkin-* + merge-multiple: true + # Upload the artifacts from the downloaded directory - name: Upload Linux executable to release run: | - gh release upload ${{ steps.create-release.outputs.release-id }} ./pumpkin --repo ${{ env.NIGHTLY_REPO }} + gh release upload ${{ steps.create-release.outputs.release-id }} pumpkin/pumpkin-ubuntu-latest --repo ${{ env.NIGHTLY_REPO }} env: GITHUB_TOKEN: ${{ secrets.COMMIT_REPO_TOKEN }} - # Download and upload the Windows artifact - - name: Download Windows executable - uses: actions/download-artifact@v5 - with: - name: pumpkin-windows-latest - path: ./ - - name: Upload Windows executable to release run: | - gh release upload ${{ steps.create-release.outputs.release-id }} ./pumpkin.exe --repo ${{ env.NIGHTLY_REPO }} + gh release upload ${{ steps.create-release.outputs.release-id }} pumpkin/pumpkin-windows-latest.exe --repo ${{ env.NIGHTLY_REPO }} env: GITHUB_TOKEN: ${{ secrets.COMMIT_REPO_TOKEN }} - # Download and upload the macOS artifact - - name: Download macOS executable - uses: actions/download-artifact@v5 - with: - name: pumpkin-macos-latest - path: ./ - - name: Upload macOS executable to release run: | - gh release upload ${{ steps.create-release.outputs.release-id }} ./pumpkin --repo ${{ env.NIGHTLY_REPO }} + gh release upload ${{ steps.create-release.outputs.release-id }} pumpkin/pumpkin-macos-latest --repo ${{ env.NIGHTLY_REPO }} env: GITHUB_TOKEN: ${{ secrets.COMMIT_REPO_TOKEN }}