Merge branch 'develop' into ci-arm64-fix

Kong · Jan 23, 2025 · 9ef4242 · 9ef4242
2 parents b8b821d + 94d30ca
commit 9ef4242
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -92,7 +92,11 @@ jobs:
       - name: 'Publish Binary'
         run: |
           pip install packaging
-          GIT_COMMIT=${{ github.sha }} GIT_TAG=$GIT_TAG RUNNER_OS=${{ matrix.os }} ./scripts/ci/build.sh
+          GIT_COMMIT=${{ github.sha }} \
+          GIT_TAG=$GIT_TAG \
+          RUNNER_OS=${{ matrix.os }} \
+          TARGET_ARCH=${{ matrix.os=='ubuntu-22.04-arm' && 'arm64' || 'x64' }} \
+          ./scripts/ci/build.sh
       - name: Upload artifacts
         if: always()
         uses: actions/upload-artifact@v4
@@ -161,8 +165,10 @@ jobs:
       - name: 'Publish Binary'
         run: |
           pip install packaging
-          GIT_COMMIT=${{ github.sha }} GIT_TAG=$GIT_TAG ./scripts/ci/build.sh
-          # Perform SCA analysis for the code repository
+          GIT_COMMIT=${{ github.sha }} \
+          GIT_TAG=$GIT_TAG \
+          TARGET_ARCH=${{ matrix.os=='ubuntu-22.04-arm' && 'arm64' || 'x64' }} \
+          ./scripts/ci/build.sh
       - name: Upload artifacts
         if: always()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build-lint-test.yaml b/.github/workflows/build-lint-test.yaml
@@ -1,6 +1,6 @@
 name: build-lint-test
 
-on: [push, workflow_dispatch]
+on: [push, workflow_dispatch, pull_request]
 
 env:
   LIBCURL_RELEASE: 'LATEST'
@@ -208,8 +208,7 @@ jobs:
           RUN_TESTS=true \
           RUN_PREGYP_CLEAN=false \
           PUBLISH_BINARY=false \
-          PUBLISH_BINARY=false \
-            ./scripts/ci/build.sh
+          ./scripts/ci/build.sh
       - name: Upload artifacts
         if: always() && steps.run_result.outputs.run_result != 'success'
         uses: actions/upload-artifact@v4