Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use process.arch to determine default target arch #85

Merged
merged 2 commits into from
Jan 23, 2025
Merged

fix: use process.arch to determine default target arch #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dcd9ac
fix: use process.arch to determine default target arch
hexchain Jan 23, 2025
3ac7e40
rm target_arch from build-and-release
filfreire Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build-and-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ jobs:
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()
Expand Down Expand Up @@ -167,7 +166,6 @@ jobs:
pip install packaging
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()
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ jobs:
RUN_TESTS=false \
RUN_PREGYP_CLEAN=false \
PUBLISH_BINARY=false \
TARGET_ARCH=${{ matrix.os=='ubuntu-22.04-arm' && 'arm64' || 'x64' }} \
./scripts/ci/build.sh
- name: 'Run lint'
if: matrix.run-lint-and-tsc && steps.run_result.outputs.run_result != 'success'
Expand Down Expand Up @@ -209,7 +208,6 @@ jobs:
RUN_TESTS=true \
RUN_PREGYP_CLEAN=false \
PUBLISH_BINARY=false \
TARGET_ARCH=${{ matrix.os=='ubuntu-22.04-arm' && 'arm64' || 'x64' }} \
./scripts/ci/build.sh
- name: Upload artifacts
if: always() && steps.run_result.outputs.run_result != 'success'
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ LOGS_FOLDER=${BUILD_LOGS_FOLDER:-./logs}
mkdir -p $LOGS_FOLDER

# ia32, x64, armv7, etc
target_arch=${TARGET_ARCH:-"x64"}
target_arch=${TARGET_ARCH:-"$(node -e 'console.log(process.arch)')"}
# the build system of some dependencies (e.g. zstd and openldap) seems to read
# and use this variable, so unset it here to avoid making them fail
unset TARGET_ARCH
Expand Down
Loading