diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index db30206..559c168 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -45,7 +45,7 @@ jobs: fi # If dist/ was different than expected, upload the expected version as an artifact - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() && steps.diff.conclusion == 'failure' }} with: name: dist diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 9973bfa..0457944 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -26,12 +26,16 @@ jobs: run: npm run fmt:check test-action: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v3 - name: Get scarb version id: extractScarbVersion + shell: bash run: | snfoundry_version=$(curl -s https://api.github.com/repos/foundry-rs/starknet-foundry/releases/latest | grep tarball_url | awk -F '/' '{print $8}' | tr -d '",') version=$(curl -s https://raw.githubusercontent.com/foundry-rs/starknet-foundry/$snfoundry_version/.tool-versions | awk '{print $2}') @@ -58,11 +62,15 @@ jobs: working-directory: myproject test-action-with-tools-file: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v3 - name: "Create .tool-versions file" + shell: bash run: echo -en 'scarb 2.5.0 \nstarknet-foundry 0.16.0' > .tool-versions - name: "Setup Scarb using `.tool-versions` file" @@ -72,3 +80,4 @@ jobs: uses: ./ - run: snforge --version | grep "snforge 0.16.0" + shell: bash diff --git a/action.yml b/action.yml index 874ea1d..390d5d4 100644 --- a/action.yml +++ b/action.yml @@ -17,5 +17,11 @@ outputs: starknet-foundry-version: description: The version of installed Starknet Foundry runs: - using: node20 - main: "dist/index.js" + using: "composite" + steps: + - name: Set up Universal Sierra Compiler + uses: software-mansion/setup-universal-sierra-compiler@v1 + + - name: Set up Starknet Foundry + shell: bash + run: node dist/index.js diff --git a/dist/index.js b/dist/index.js index dde3dd0..24c42a4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -29998,21 +29998,6 @@ async function findStarknetFoundryDir(extractedPath) { ); } -async function downloadUniversalSierraCompiler() { - const scriptUrl = - "https://raw.githubusercontent.com/software-mansion/universal-sierra-compiler/master/scripts/install.sh"; - - try { - const scriptPath = await tool_cache.downloadTool(scriptUrl); - - await exec.exec(`chmod +x ${scriptPath}`); - - await exec.exec(scriptPath); - } catch (error) { - core.setFailed(error.message); - } -} - ;// CONCATENATED MODULE: ./lib/main.js @@ -30048,7 +30033,6 @@ async function main() { triplet, ); if (!StarknetFoundryPrefix) { - await downloadUniversalSierraCompiler(); const download = await downloadStarknetFoundry( StarknetFoundryRepo, StarknetFoundryVersion, diff --git a/lib/download.js b/lib/download.js index 1dc32d0..f6b1564 100644 --- a/lib/download.js +++ b/lib/download.js @@ -38,18 +38,3 @@ async function findStarknetFoundryDir(extractedPath) { `could not find Starknet Foundry directory in ${extractedPath}`, ); } - -export async function downloadUniversalSierraCompiler() { - const scriptUrl = - "https://raw.githubusercontent.com/software-mansion/universal-sierra-compiler/master/scripts/install.sh"; - - try { - const scriptPath = await tc.downloadTool(scriptUrl); - - await exec.exec(`chmod +x ${scriptPath}`); - - await exec.exec(scriptPath); - } catch (error) { - core.setFailed(error.message); - } -} diff --git a/lib/main.js b/lib/main.js index a55ded2..f08a1fd 100644 --- a/lib/main.js +++ b/lib/main.js @@ -39,7 +39,6 @@ export default async function main() { triplet, ); if (!StarknetFoundryPrefix) { - await downloadUniversalSierraCompiler(); const download = await downloadStarknetFoundry( StarknetFoundryRepo, StarknetFoundryVersion,