Skip to content

Commit

Permalink
Fix macOS and future Alpine prebuilds
Browse files Browse the repository at this point in the history
Co-authored-by: Matthew McEachen <[email protected]>
  • Loading branch information
m4heshd and mceachen committed Nov 9, 2023
1 parent ef45075 commit c17efce
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/prebuild-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16
- if: ${{ startsWith(matrix.os, 'windows') }}
run: pip.exe install setuptools
- if: ${{ ! startsWith(matrix.os, 'windows') }}
run: python3 -m pip install setuptools
- run: npm install --ignore-scripts
- run: ${{ env.TEST_COMMAND }}
- if: matrix.os == 'macos-latest' && inputs.arm == true
Expand All @@ -81,7 +85,7 @@ jobs:
container: node:16-alpine
steps:
- uses: actions/checkout@v3
- run: apk add build-base git python3 --update-cache
- run: apk add build-base git python3 py3-setuptools --update-cache
- run: npm install --ignore-scripts
- run: ${{ env.TEST_COMMAND }}

Expand All @@ -94,7 +98,7 @@ jobs:
- uses: docker/setup-qemu-action@v2
- run: |
docker run --rm -v $(pwd):/tmp/project --entrypoint /bin/sh --platform linux/arm64 node:16-alpine -c "\
apk add build-base git python3 --update-cache && \
apk add build-base git python3 py3-setuptools --update-cache && \
cd /tmp/project && \
npm install --ignore-scripts && \
${{ env.TEST_COMMAND }}"
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/prebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16
- if: ${{ startsWith(matrix.os, 'windows') }}
run: pip.exe install setuptools
- if: ${{ ! startsWith(matrix.os, 'windows') }}
run: python3 -m pip install setuptools
- run: npm install --ignore-scripts
- run: ${{ env.NODE_BUILD_CMD }}
- run: ${{ env.ELECTRON_BUILD_CMD }}
Expand All @@ -43,7 +47,7 @@ jobs:
container: node:16-alpine
steps:
- uses: actions/checkout@v3
- run: apk add build-base git python3 --update-cache
- run: apk add build-base git python3 py3-setuptools --update-cache
- run: npm install --ignore-scripts
- run: ${{ env.NODE_BUILD_CMD }}

Expand All @@ -55,7 +59,7 @@ jobs:
- uses: docker/setup-qemu-action@v2
- run: |
docker run --rm -v $(pwd):/tmp/project --entrypoint /bin/sh --platform linux/arm64 node:16-alpine -c "\
apk add build-base git python3 --update-cache && \
apk add build-base git python3 py3-setuptools --update-cache && \
cd /tmp/project && \
npm install --ignore-scripts && \
${{ env.NODE_BUILD_CMD }}"
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- if: ${{ startsWith(matrix.os, 'windows') }}
run: pip.exe install setuptools
- if: ${{ ! startsWith(matrix.os, 'windows') }}
run: python3 -m pip install setuptools
- run: npm install --ignore-scripts
- run: npm run build-debug
- run: npm test
Expand All @@ -39,7 +43,7 @@ jobs:
container: node:18-alpine
steps:
- uses: actions/checkout@v3
- run: apk add build-base git python3 --update-cache
- run: apk add build-base git python3 py3-setuptools --update-cache
- run: npm install --ignore-scripts
- run: npm run build-debug
- run: npm test
Expand All @@ -52,7 +56,7 @@ jobs:
- uses: docker/setup-qemu-action@v2
- run: |
docker run --rm -v $(pwd):/tmp/project --entrypoint /bin/sh --platform linux/arm64 node:18-alpine -c "\
apk add build-base git python3 --update-cache && \
apk add build-base git python3 py3-setuptools --update-cache && \
cd /tmp/project && \
npm install --ignore-scripts && \
npm run build-debug && \
Expand Down

0 comments on commit c17efce

Please sign in to comment.