From 4ae874c622b1dca4c42d6314ec323da84585964c Mon Sep 17 00:00:00 2001 From: Blockiosaurus Date: Mon, 22 Jul 2024 16:58:10 -0400 Subject: [PATCH] Fixing artifact CI version. --- .github/workflows/build-programs.yml | 2 +- .github/workflows/build-rust-client.yml | 2 +- .github/workflows/deploy-program.yml | 14 ++++++-------- .github/workflows/test-rust-client.yml | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-programs.yml b/.github/workflows/build-programs.yml index fb0d0d01..d9465914 100644 --- a/.github/workflows/build-programs.yml +++ b/.github/workflows/build-programs.yml @@ -57,7 +57,7 @@ jobs: PROGRAMS: ${{ env.PROGRAMS }} - name: Upload program builds - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: program-builds # First wildcard ensures exported paths are consistently under the programs folder. diff --git a/.github/workflows/build-rust-client.yml b/.github/workflows/build-rust-client.yml index 5fbef042..fa09b171 100644 --- a/.github/workflows/build-rust-client.yml +++ b/.github/workflows/build-rust-client.yml @@ -57,7 +57,7 @@ jobs: run: cargo build --all-features --release - name: Upload Rust client builds - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: rust-client-builds # First wildcard ensures exported paths are consistently under the clients folder. diff --git a/.github/workflows/deploy-program.yml b/.github/workflows/deploy-program.yml index c00b1127..0c065735 100644 --- a/.github/workflows/deploy-program.yml +++ b/.github/workflows/deploy-program.yml @@ -86,15 +86,13 @@ jobs: with: version: ${{ env.ANCHOR_VERSION }} cache: ${{ env.CACHE }} - - + - name: Install cargo-release uses: metaplex-foundation/actions/install-cargo-release@v1 if: github.event.inputs.publish_crate == 'true' with: cache: ${{ env.CACHE }} - - name: Install cargo-release uses: metaplex-foundation/actions/install-cargo-release@v1 if: github.event.inputs.publish_crate == 'true' @@ -124,7 +122,7 @@ jobs: MAJOR=`echo ${VERSION} | cut -d. -f1` MINOR=`echo ${VERSION} | cut -d. -f2` PATCH=`echo ${VERSION} | cut -d. -f3` - + if [ "${{ inputs.bump }}" == "major" ]; then MAJOR=$((MAJOR + 1)) MINOR=0 @@ -135,7 +133,7 @@ jobs: else PATCH=$((PATCH + 1)) fi - + PROGRAM_VERSION="${MAJOR}.${MINOR}.${PATCH}" cp ./idls/${IDL_NAME}.json ./idls/${IDL_NAME}-previous.json @@ -145,7 +143,7 @@ jobs: echo PROGRAM_VERSION="${PROGRAM_VERSION}" >> $GITHUB_ENV - name: Download program builds - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: program-builds @@ -181,13 +179,13 @@ jobs: git stash git config user.name "${{ env.COMMIT_USER_NAME }}" git config user.email "${{ env.COMMIT_USER_EMAIL }}" - + cargo login ${{ secrets.CRATES_TOKEN }} cargo release ${{ inputs.bump }} --no-confirm --no-push --no-tag --no-publish --execute git reset --soft HEAD~1 git stash pop - + - name: Commit and tag new version uses: stefanzweifel/git-auto-commit-action@v4 if: github.event.inputs.publish_crate == 'true' && github.event.inputs.cluster == 'mainnet-beta' diff --git a/.github/workflows/test-rust-client.yml b/.github/workflows/test-rust-client.yml index c8025770..23c5d066 100644 --- a/.github/workflows/test-rust-client.yml +++ b/.github/workflows/test-rust-client.yml @@ -32,7 +32,7 @@ jobs: cache: ${{ env.CACHE }} - name: Download program builds - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: program-builds