From f54ceb09738787a0496e516802a2c0f7d871db70 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 8 Oct 2023 21:49:58 +0100 Subject: [PATCH] CI: create prebuilds in src directory --- .circleci/config.yml | 4 ++-- .github/workflows/ci.yml | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fbec44bb..e8732ca7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ jobs: sudo docker exec sharp sh -c "npm run clean" sudo docker exec sharp sh -c "npm install --ignore-scripts" sudo docker exec sharp sh -c "npm test" - - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --upload=$prebuild_upload\" || true" + - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"cd src && ln -s ../package.json && npx prebuild --upload=$prebuild_upload\" || true" linux-arm64-glibc-node-20: resource_class: arm.medium machine: @@ -83,7 +83,7 @@ jobs: sudo docker exec sharp sh -c "npm run clean" sudo docker exec sharp sh -c "npm install --ignore-scripts" sudo docker exec sharp sh -c "npm test" - - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --upload=$prebuild_upload\" || true" + - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"cd src && ln -s ../package.json && npx prebuild --upload=$prebuild_upload\" || true" linux-arm64-musl-node-20: resource_class: arm.medium machine: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8800b75..e521e12a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,10 +110,17 @@ jobs: npm run clean npm install --ignore-scripts npm test + - name: Prebuild copy package.json + if: matrix.prebuild && startsWith(github.ref, 'refs/tags/') + uses: chpoit/js-copy-github-action@v1 + with: + source: package.json + target: src/package.json - name: Prebuild if: matrix.prebuild && startsWith(github.ref, 'refs/tags/') env: prebuild_upload: ${{ secrets.GITHUB_TOKEN }} + working-directory: src run: npx prebuild github-runner-qemu: permissions: @@ -142,7 +149,7 @@ jobs: npm run clean npm install --ignore-scripts npx mocha --no-config --spec=test/unit/io.js --timeout=30000 - [[ -n $prebuild_upload ]] && npx prebuild || true + [[ -n $prebuild_upload ]] && cd src && ln -s ../package.json && npx prebuild || true macstadium-runner: permissions: contents: write @@ -187,4 +194,4 @@ jobs: if: matrix.prebuild && startsWith(github.ref, 'refs/tags/') env: prebuild_upload: ${{ secrets.GITHUB_TOKEN }} - run: npx prebuild + run: cd src && ln -s ../package.json && npx prebuild