diff --git a/.github/alpine/setup-node.sh b/.github/alpine/setup-node.sh deleted file mode 100755 index f0e942f58a..0000000000 --- a/.github/alpine/setup-node.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# A workaround for "JavaScript Actions in Alpine containers are only supported on x64 Linux runners." -# https://github.com/actions/runner/blob/8a9b96806d12343f7d123c669e29c629138023dd/src/Runner.Worker/Handlers/StepHost.cs#L283-L290 -if [ "$(uname -m)" != "x86_64" ]; then - for node in /__e/node*; do - mkdir -p $node/bin - ln -s /usr/bin/node $node/bin/node - ln -s /usr/bin/npm $node/bin/npm - done - sed -i 's/ID=alpine/ID=unknown/' /usr/lib/os-release -fi diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 073a38c948..f6ea82168e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,8 +44,17 @@ jobs: steps: - name: Initialize Alpine Linux if: ${{ contains(matrix.container.image, 'alpine') }} + # Enable JavaScript Actions in Alpine containers on Arm64 runners + # See https://github.com/getsentry/sentry-dotnet/pull/5455 run: | - curl -sSL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/.github/alpine/setup-node.sh | sudo bash /dev/stdin + if [ "$(uname -m)" != "x86_64" ]; then + for node in /__e/node*; do + sudo mkdir -p "$node/bin" + sudo ln -s /usr/bin/node "$node/bin/node" + sudo ln -s /usr/bin/npm "$node/bin/npm" + done + sudo sed -i 's/ID=alpine/ID=unknown/' /usr/lib/os-release + fi - name: Checkout uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 @@ -108,8 +117,17 @@ jobs: steps: - name: Initialize Alpine Linux if: ${{ contains(matrix.container.image, 'alpine') }} + # Enable JavaScript Actions in Alpine containers on Arm64 runners + # See https://github.com/getsentry/sentry-dotnet/pull/5455 run: | - curl -sSL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/.github/alpine/setup-node.sh | sudo bash /dev/stdin + if [ "$(uname -m)" != "x86_64" ]; then + for node in /__e/node*; do + sudo mkdir -p "$node/bin" + sudo ln -s /usr/bin/node "$node/bin/node" + sudo ln -s /usr/bin/npm "$node/bin/npm" + done + sudo sed -i 's/ID=alpine/ID=unknown/' /usr/lib/os-release + fi - name: Cancel Previous Runs if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')