From 0be087b5d71892918ed3274dbddadac20d65f09e Mon Sep 17 00:00:00 2001 From: LongYinan Date: Fri, 8 Dec 2023 06:39:16 +0000 Subject: [PATCH] ci: fix rust build during deployment (#5233) --- .github/actions/build-rust/action.yml | 5 ++++- .github/workflows/deploy.yml | 4 ++-- packages/backend/storage/package.json | 2 +- packages/frontend/native/package.json | 2 +- yarn.lock | 12 ++++++------ 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/actions/build-rust/action.yml b/.github/actions/build-rust/action.yml index 08f230cef90ac..cf396ea372e2b 100644 --- a/.github/actions/build-rust/action.yml +++ b/.github/actions/build-rust/action.yml @@ -32,7 +32,9 @@ runs: - name: Set CC if: ${{ contains(inputs.target, 'linux') && inputs.package != '@affine/native' }} shell: bash - run: echo "CC=clang" >> "$GITHUB_ENV" + run: | + echo "CC=clang" >> "$GITHUB_ENV" + echo "TARGET_CC=clang" >> "$GITHUB_ENV" - name: Cache cargo uses: actions/cache@v3 @@ -50,3 +52,4 @@ runs: yarn workspace ${{ inputs.package }} nx build ${{ inputs.package }} --target ${{ inputs.target }} --use-napi-cross env: NX_CLOUD_ACCESS_TOKEN: ${{ inputs.nx_token }} + DEBUG: 'napi:*' diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 253270d81ff93..52e03ae9c8b3c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -69,7 +69,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Node.js uses: ./.github/actions/setup-node - - name: Setup Rust + - name: Build Rust uses: ./.github/actions/build-rust with: target: 'x86_64-unknown-linux-gnu' @@ -90,7 +90,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Node.js uses: ./.github/actions/setup-node - - name: Setup Rust + - name: Build Rust uses: ./.github/actions/build-rust with: target: 'aarch64-unknown-linux-gnu' diff --git a/packages/backend/storage/package.json b/packages/backend/storage/package.json index 87f4002f67bbc..5f2827ef08b7c 100644 --- a/packages/backend/storage/package.json +++ b/packages/backend/storage/package.json @@ -35,7 +35,7 @@ "version": "napi version" }, "devDependencies": { - "@napi-rs/cli": "3.0.0-alpha.12", + "@napi-rs/cli": "3.0.0-alpha.15", "lib0": "^0.2.87", "nx": "^17.1.3", "nx-cloud": "^16.5.2", diff --git a/packages/frontend/native/package.json b/packages/frontend/native/package.json index eb01946abeff5..117d59b4e7090 100644 --- a/packages/frontend/native/package.json +++ b/packages/frontend/native/package.json @@ -35,7 +35,7 @@ } }, "devDependencies": { - "@napi-rs/cli": "3.0.0-alpha.12", + "@napi-rs/cli": "3.0.0-alpha.15", "@types/node": "^20.9.3", "@types/uuid": "^9.0.7", "ava": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index 1c3f3d459197f..4fa2928e3a80d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -656,7 +656,7 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/native@workspace:packages/frontend/native" dependencies: - "@napi-rs/cli": "npm:3.0.0-alpha.12" + "@napi-rs/cli": "npm:3.0.0-alpha.15" "@types/node": "npm:^20.9.3" "@types/uuid": "npm:^9.0.7" ava: "npm:^6.0.0" @@ -821,7 +821,7 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/storage@workspace:packages/backend/storage" dependencies: - "@napi-rs/cli": "npm:3.0.0-alpha.12" + "@napi-rs/cli": "npm:3.0.0-alpha.15" lib0: "npm:^0.2.87" nx: "npm:^17.1.3" nx-cloud: "npm:^16.5.2" @@ -7411,9 +7411,9 @@ __metadata: languageName: node linkType: hard -"@napi-rs/cli@npm:3.0.0-alpha.12": - version: 3.0.0-alpha.12 - resolution: "@napi-rs/cli@npm:3.0.0-alpha.12" +"@napi-rs/cli@npm:3.0.0-alpha.15": + version: 3.0.0-alpha.15 + resolution: "@napi-rs/cli@npm:3.0.0-alpha.15" dependencies: "@napi-rs/cross-toolchain": "npm:^0.0.12" "@octokit/rest": "npm:^20.0.2" @@ -7441,7 +7441,7 @@ __metadata: bin: napi: dist/cli.js napi-raw: cli.mjs - checksum: 50911df427f970f6926dc62e083c740b8b342e2181c65a56f4f0758d96995d110b5762fffafc1124628b6192987986b3bba93adf25921eda39c81034cd1dff54 + checksum: e4223d226bf4412241a130a559867c1d0ed74b2ad2068853db31eb385520b2b4ebaf886900741713d8c5a840c50765d3069e2361296a819ffdfcab0a020ef700 languageName: node linkType: hard