From 937835443e5bb38de0dfde93ea7ea68a6bcab752 Mon Sep 17 00:00:00 2001 From: Osei Fortune Date: Wed, 7 Aug 2024 03:23:02 -0400 Subject: [PATCH] chore: ci --- .github/workflows/pull-request.yml | 3 +-- tools/scripts/build-android.sh | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index b0aeeb476..cee4e7e70 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -221,6 +221,5 @@ jobs: run: | echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ../../.npmrc echo "Publishing @nativescript/canvas@$NPM_VERSION to NPM with tag $NPM_TAG..." - npm run publish-packages -- --name $NPM_PACKAGES --verify true --version $NPM_VERSION - npm publish nativescript-canvas-$NPM_VERSION.tgz --tag $NPM_TAG + npm run publish-packages --name $NPM_PACKAGES --verify true --version $NPM_VERSION diff --git a/tools/scripts/build-android.sh b/tools/scripts/build-android.sh index e7b8bf3d5..2fce314f6 100755 --- a/tools/scripts/build-android.sh +++ b/tools/scripts/build-android.sh @@ -40,14 +40,9 @@ RUSTFLAGS="-Zlocation-detail=none -C panic=abort" if [ "$TARGET" = "aarch64-linux-android" ]; then - RUSTFLAGS="-Zlocation-detail=none -C panic=abort -C target-feature=-outline-atomics -C target-cpu=native -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" + RUSTFLAGS="-Zlocation-detail=none -C panic=abort -C target-feature=-outline-atomics" fi -if [ "$TARGET" = "x86_64-linux-android" ]; then - RUSTFLAGS="-Zlocation-detail=none -C panic=abort -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" -fi - - RUSTFLAGS="$RUSTFLAGS" cargo +nightly build -Z build-std='std,panic_abort' -Z build-std-features=panic_immediate_abort --target $TARGET $EXTRA_ARGS -p canvas-android --release pushd packages/canvas/src-native/canvas-android