diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 27501bd4..8e62c7b7 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -1,10 +1,10 @@ name: 'Install dependencies' description: 'Installs pnpm, node, Node packages, and foundry' -inputs: + +outputs: foundry-version: - description: 'Foundry version' - type: string - default: 'nightly' + description: 'The version of Foundry that was installed' + value: ${{ steps.set-foundry-version.outputs.foundry-version }} runs: using: 'composite' @@ -22,6 +22,11 @@ runs: shell: bash run: pnpm i + - name: Set Foundry version + id: set-foundry-version + shell: bash + run: echo "foundry-version=v0.3.0" >> $GITHUB_OUTPUT + - uses: foundry-rs/foundry-toolchain@v1 with: - version: ${{ inputs.foundry-version }} + version: ${{ steps.set-foundry-version.outputs.foundry-version }} diff --git a/.github/workflows/check-code-format.yml b/.github/workflows/check-code-format.yml index 7ccd4373..c822a25c 100644 --- a/.github/workflows/check-code-format.yml +++ b/.github/workflows/check-code-format.yml @@ -9,8 +9,6 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/setup - with: - foundry-version: nightly - name: Check code format run: pnpm fmt:check diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8ae6eb6a..9125766f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,8 +22,6 @@ jobs: submodules: recursive - uses: ./.github/actions/setup - with: - foundry-version: nightly - name: Generate documentation run: forge doc -b diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6a22884..29cebffd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,8 +28,6 @@ jobs: git config user.email 153998668+rollups-contracts-bot@users.noreply.github.com - uses: ./.github/actions/setup - with: - foundry-version: nightly - name: Create release PR or publish packages to npmjs.com uses: changesets/action@3de3850952bec538fde60aac71731376e57b9b57 @@ -57,8 +55,6 @@ jobs: submodules: recursive - uses: ./.github/actions/setup - with: - foundry-version: nightly - name: Install Python dependencies run: pip install yq diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aebad727..444c52da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,8 +21,6 @@ jobs: submodules: recursive - uses: ./.github/actions/setup - with: - foundry-version: nightly - name: Run tests run: forge test -vvv diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml index 57e746b8..9380005b 100644 --- a/.github/workflows/upload-artifacts.yml +++ b/.github/workflows/upload-artifacts.yml @@ -5,9 +5,6 @@ on: tags: - v* -env: - FOUNDRY_VERSION: nightly-2044faec64f99a21f0e5f0094458a973612d0712 - jobs: upload: name: Upload contract artifacts to GitHub Releases @@ -18,8 +15,7 @@ jobs: submodules: recursive - uses: ./.github/actions/setup - with: - foundry-version: ${{ env.FOUNDRY_VERSION }} + id: setup - name: Build contracts run: pnpm build @@ -42,7 +38,7 @@ jobs: - name: Compress Anvil deployment artifacts run: tar -czf "$FILEPATH" state.json -C export/abi localhost.json env: - FILEPATH: upload/rollups-contracts-${{ steps.extract_version.outputs.version }}-anvil-${{ env.FOUNDRY_VERSION }}.tar.gz + FILEPATH: upload/rollups-contracts-${{ steps.extract_version.outputs.version }}-anvil-${{ steps.setup.outptus.foundry-version }}.tar.gz - name: Upload files to GitHub Releases uses: softprops/action-gh-release@v2