From 148eb214303d5db8ee118afaac5b412d2ba10f0c Mon Sep 17 00:00:00 2001 From: Sander Declerck Date: Wed, 17 Dec 2025 14:07:58 +0100 Subject: [PATCH 1/3] Use new release script in GH workflows --- .github/workflows/build-and-release.yml | 2 +- .github/workflows/create-artifact.yml | 4 ++-- .github/workflows/test-on-pr.yml | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 7423778..83c11d9 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -44,7 +44,7 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} - name: Setup safe-chain - run: curl -fsSL https://raw.githubusercontent.com/AikidoSec/safe-chain/main/install-scripts/install-safe-chain.sh | sh -s -- --ci + run: curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci - name: Set the version in safe-chain package run: npm --no-git-tag-version version ${{ needs.set-version.outputs.version }} --workspace=packages/safe-chain diff --git a/.github/workflows/create-artifact.yml b/.github/workflows/create-artifact.yml index d57bce9..d7729fd 100644 --- a/.github/workflows/create-artifact.yml +++ b/.github/workflows/create-artifact.yml @@ -61,12 +61,12 @@ jobs: - name: Setup safe-chain (Mac/Linux) if: runner.os != 'Windows' - run: curl -fsSL https://raw.githubusercontent.com/AikidoSec/safe-chain/main/install-scripts/install-safe-chain.sh | sh -s -- --ci + run: curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci - name: Setup safe-chain (Windows) if: runner.os == 'Windows' shell: pwsh - run: iex "& { $(iwr 'https://raw.githubusercontent.com/AikidoSec/safe-chain/main/install-scripts/install-safe-chain.ps1' -UseBasicParsing) } -ci" + run: iex "& { $(iwr 'https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.ps1' -UseBasicParsing) } -ci" - name: Install dependencies run: npm ci --ignore-scripts diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml index 8811944..f7ee116 100644 --- a/.github/workflows/test-on-pr.yml +++ b/.github/workflows/test-on-pr.yml @@ -23,9 +23,7 @@ jobs: node-version: "lts/*" - name: Setup safe-chain - run: | - npm i -g @aikidosec/safe-chain - safe-chain setup-ci + run: curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci - name: Install dependencies run: npm ci --ignore-scripts @@ -110,7 +108,7 @@ jobs: node-version: "lts/*" - name: Setup safe-chain - run: curl -fsSL https://raw.githubusercontent.com/AikidoSec/safe-chain/main/install-scripts/install-safe-chain.sh | sh -s -- --ci + run: curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci - name: Install dependencies (root) run: npm ci From a1ec035d9cbd38a429946f56b90b3c98169d31be Mon Sep 17 00:00:00 2001 From: Sander Declerck Date: Wed, 17 Dec 2025 14:09:45 +0100 Subject: [PATCH 2/3] Use Windows installation script --- .github/workflows/build-and-release.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 83c11d9..8d8f841 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -43,9 +43,15 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} - - name: Setup safe-chain + - name: Setup safe-chain (Mac/Linux) + if: runner.os != 'Windows' run: curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci + - name: Setup safe-chain (Windows) + if: runner.os == 'Windows' + shell: pwsh + run: iex "& { $(iwr 'https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.ps1' -UseBasicParsing) } -ci" + - name: Set the version in safe-chain package run: npm --no-git-tag-version version ${{ needs.set-version.outputs.version }} --workspace=packages/safe-chain From 2cb891b9358ff169b5ad60978dd9c5e602ab95de Mon Sep 17 00:00:00 2001 From: Sander Declerck Date: Wed, 17 Dec 2025 14:12:39 +0100 Subject: [PATCH 3/3] Use correct Windows install script --- .github/workflows/build-and-release.yml | 8 +------- .github/workflows/test-on-pr.yml | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 8d8f841..83c11d9 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -43,15 +43,9 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} - - name: Setup safe-chain (Mac/Linux) - if: runner.os != 'Windows' + - name: Setup safe-chain run: curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci - - name: Setup safe-chain (Windows) - if: runner.os == 'Windows' - shell: pwsh - run: iex "& { $(iwr 'https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.ps1' -UseBasicParsing) } -ci" - - name: Set the version in safe-chain package run: npm --no-git-tag-version version ${{ needs.set-version.outputs.version }} --workspace=packages/safe-chain diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml index f7ee116..9e4a5ec 100644 --- a/.github/workflows/test-on-pr.yml +++ b/.github/workflows/test-on-pr.yml @@ -22,9 +22,15 @@ jobs: with: node-version: "lts/*" - - name: Setup safe-chain + - name: Setup safe-chain (Mac/Linux) + if: runner.os != 'Windows' run: curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci + - name: Setup safe-chain (Windows) + if: runner.os == 'Windows' + shell: pwsh + run: iex "& { $(iwr 'https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.ps1' -UseBasicParsing) } -ci" + - name: Install dependencies run: npm ci --ignore-scripts