From 6f5e630bd04c634308c0d1bb8e83d1a2cf2e3427 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 10:41:11 +0800 Subject: [PATCH 01/19] fix: ci --- .github/workflows/CI.yml | 26 +++++++++++++++++++++++++- npm/linux-arm64-gnu/README.md | 3 +++ npm/linux-arm64-gnu/package.json | 24 ++++++++++++++++++++++++ npm/linux-arm64-musl/README.md | 3 +++ npm/linux-arm64-musl/package.json | 24 ++++++++++++++++++++++++ npm/win32-ia32-msvc/README.md | 3 +++ npm/win32-ia32-msvc/package.json | 21 +++++++++++++++++++++ package.json | 5 ++++- 8 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 npm/linux-arm64-gnu/README.md create mode 100644 npm/linux-arm64-gnu/package.json create mode 100644 npm/linux-arm64-musl/README.md create mode 100644 npm/linux-arm64-musl/package.json create mode 100644 npm/win32-ia32-msvc/README.md create mode 100644 npm/win32-ia32-msvc/package.json diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 988a24b..c1a51c8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,7 +9,7 @@ permissions: 'on': push: branches: - - stable/css-modules-hash + - fix/stable-ci tags-ignore: - '**' paths-ignore: @@ -33,6 +33,10 @@ jobs: - host: windows-latest build: yarn build target: x86_64-pc-windows-msvc + - host: windows-latest + target: i686-pc-windows-msvc + name: win32-ia32-msvc + build: yarn build --target i686-pc-windows-msvc - host: ubuntu-latest target: x86_64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian @@ -44,6 +48,26 @@ jobs: target: x86_64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine build: set -e && yarn build && strip *.node + - host: ubuntu-latest + target: aarch64-unknown-linux-gnu + name: linux-arm64-gnu + docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 + build: |- + set -e && + export JEMALLOC_SYS_WITH_LG_PAGE=16 && export CC_aarch64_unknown_linux_gnu=/usr/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-gcc && + rustup target add aarch64-unknown-linux-gnu && + yarn build --target aarch64-unknown-linux-gnu && + aarch64-unknown-linux-gnu-strip *.node + - host: ubuntu-latest + target: aarch64-unknown-linux-musl + name: linux-arm64-musl + docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine + build: |- + set -e && + export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc && + rustup target add aarch64-unknown-linux-musl && + yarn build --target aarch64-unknown-linux-musl && + /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node - host: macos-latest target: aarch64-apple-darwin build: | diff --git a/npm/linux-arm64-gnu/README.md b/npm/linux-arm64-gnu/README.md new file mode 100644 index 0000000..3c72c9a --- /dev/null +++ b/npm/linux-arm64-gnu/README.md @@ -0,0 +1,3 @@ +# `@ice/css-modules-hash-linux-arm64-gnu` + +This is the **aarch64-unknown-linux-gnu** binary for `@ice/css-modules-hash` diff --git a/npm/linux-arm64-gnu/package.json b/npm/linux-arm64-gnu/package.json new file mode 100644 index 0000000..01d817c --- /dev/null +++ b/npm/linux-arm64-gnu/package.json @@ -0,0 +1,24 @@ +{ + "name": "@ice/css-modules-hash-linux-arm64-gnu", + "version": "0.0.6", + "os": [ + "linux" + ], + "cpu": [ + "arm64" + ], + "main": "css-modules-hash.linux-arm64-gnu.node", + "files": [ + "css-modules-hash.linux-arm64-gnu.node" + ], + "license": "MIT", + "engines": { + "node": ">= 10" + }, + "libc": [ + "glibc" + ], + "repository": { + "url": "https://github.com/ice-lab/icepack" + } +} \ No newline at end of file diff --git a/npm/linux-arm64-musl/README.md b/npm/linux-arm64-musl/README.md new file mode 100644 index 0000000..c264406 --- /dev/null +++ b/npm/linux-arm64-musl/README.md @@ -0,0 +1,3 @@ +# `@ice/css-modules-hash-linux-arm64-musl` + +This is the **aarch64-unknown-linux-musl** binary for `@ice/css-modules-hash` diff --git a/npm/linux-arm64-musl/package.json b/npm/linux-arm64-musl/package.json new file mode 100644 index 0000000..2775835 --- /dev/null +++ b/npm/linux-arm64-musl/package.json @@ -0,0 +1,24 @@ +{ + "name": "@ice/css-modules-hash-linux-arm64-musl", + "version": "0.0.6", + "os": [ + "linux" + ], + "cpu": [ + "arm64" + ], + "main": "css-modules-hash.linux-arm64-musl.node", + "files": [ + "css-modules-hash.linux-arm64-musl.node" + ], + "license": "MIT", + "engines": { + "node": ">= 10" + }, + "libc": [ + "musl" + ], + "repository": { + "url": "https://github.com/ice-lab/icepack" + } +} \ No newline at end of file diff --git a/npm/win32-ia32-msvc/README.md b/npm/win32-ia32-msvc/README.md new file mode 100644 index 0000000..dbca5e8 --- /dev/null +++ b/npm/win32-ia32-msvc/README.md @@ -0,0 +1,3 @@ +# `@ice/css-modules-hash-win32-ia32-msvc` + +This is the **i686-pc-windows-msvc** binary for `@ice/css-modules-hash` diff --git a/npm/win32-ia32-msvc/package.json b/npm/win32-ia32-msvc/package.json new file mode 100644 index 0000000..9aebe61 --- /dev/null +++ b/npm/win32-ia32-msvc/package.json @@ -0,0 +1,21 @@ +{ + "name": "@ice/css-modules-hash-win32-ia32-msvc", + "version": "0.0.6", + "os": [ + "win32" + ], + "cpu": [ + "i686" + ], + "main": "css-modules-hash.win32-ia32-msvc.node", + "files": [ + "css-modules-hash.win32-ia32-msvc.node" + ], + "license": "MIT", + "engines": { + "node": ">= 10" + }, + "repository": { + "url": "https://github.com/ice-lab/icepack" + } +} \ No newline at end of file diff --git a/package.json b/package.json index 41a61e0..e851a35 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,10 @@ "aarch64-apple-darwin", "aarch64-pc-windows-msvc", "x86_64-unknown-linux-musl", - "universal-apple-darwin" + "universal-apple-darwin", + "aarch64-unknown-linux-gnu", + "aarch64-unknown-linux-musl", + "i686-pc-windows-msvc" ] } }, From 65e1adcab7fd13e805556967018e55b5acb32a96 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 10:58:39 +0800 Subject: [PATCH 02/19] fix: ci test --- .github/workflows/CI.yml | 76 ++++++++++++++++++++++++++++++++++++++-- __test__/index.spec.mjs | 2 +- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c1a51c8..3b5ff47 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -143,7 +143,6 @@ jobs: - host: windows-latest target: x86_64-pc-windows-msvc node: - - '14' - '16' - '18' runs-on: ${{ matrix.settings.host }} @@ -175,7 +174,6 @@ jobs: fail-fast: false matrix: node: - - '14' - '16' - '18' runs-on: ubuntu-latest @@ -207,7 +205,6 @@ jobs: fail-fast: false matrix: node: - - '14' - '16' - '18' runs-on: ubuntu-latest @@ -233,6 +230,79 @@ jobs: shell: bash - name: Test bindings run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn test + test-linux-aarch64-gnu-binding: + name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + node: + - '16' + - '18' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + name: bindings-aarch64-unknown-linux-gnu + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Install dependencies + run: | + yarn config set supportedArchitectures.cpu "arm64" + yarn config set supportedArchitectures.libc "glibc" + yarn install + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: arm64 + - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - name: Setup and run tests + uses: addnab/docker-run-action@v3 + with: + image: node:${{ matrix.node }}-slim + options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' + run: | + set -e + yarn test + ls -la + test-linux-aarch64-musl-binding: + name: Test bindings on aarch64-unknown-linux-musl - node@lts + needs: + - build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + name: bindings-aarch64-unknown-linux-musl + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Install dependencies + run: | + yarn config set supportedArchitectures.cpu "arm64" + yarn config set supportedArchitectures.libc "musl" + yarn install + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: arm64 + - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - name: Setup and run tests + uses: addnab/docker-run-action@v3 + with: + image: node:lts-alpine + options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' + run: | + set -e + yarn test universal-macOS: name: Build universal macOS binary needs: diff --git a/__test__/index.spec.mjs b/__test__/index.spec.mjs index 1a95748..283acd6 100644 --- a/__test__/index.spec.mjs +++ b/__test__/index.spec.mjs @@ -3,7 +3,7 @@ import test from 'ava' import { getCssModulesLocalIdent } from '../index.js' test('template [hash]', (t) => { - t.is(getCssModulesLocalIdent('src/pages/index.module.css', 'test' ,'[hash]'), '_58deea1c54f94c19c993'); + t.is(getCssModulesLocalIdent('src/pages/index.module.css', 'test' ,'[hash]'), 'c25864290c9e89ea1553'); }) test('template [path][name][ext]__[local]', (t) => { t.is(getCssModulesLocalIdent('src/pages/index.module.css', 'test' ,'[path][name][ext]__[local]'), 'src-pages-index-module-css__test'); From 6dfd240aac2d9f8e8d7eadfb8d6c98056d33a566 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 11:06:24 +0800 Subject: [PATCH 03/19] fix: ci --- .github/workflows/CI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3b5ff47..692370b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -242,9 +242,9 @@ jobs: - '18' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Download artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: bindings-aarch64-unknown-linux-gnu path: . @@ -276,9 +276,9 @@ jobs: - build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Download artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: bindings-aarch64-unknown-linux-musl path: . From 002b94c182d9863f2a2cc0cce913be8dd0069400 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 11:19:45 +0800 Subject: [PATCH 04/19] fix: ci --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 692370b..c536e46 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -343,6 +343,8 @@ jobs: - test-macOS-windows-binding - test-linux-x64-gnu-binding - test-linux-x64-musl-binding + - test-linux-aarch64-musl-binding + - test-linux-aarch64-gnu-binding - universal-macOS steps: - uses: actions/checkout@v3 From 5787b6e9b64d45261c6e5644b28839ba5e73e847 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 12:45:35 +0800 Subject: [PATCH 05/19] fix: ci --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c536e46..a0838d8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -321,12 +321,12 @@ jobs: - name: Download macOS x64 artifact uses: actions/download-artifact@v3 with: - name: bindings-x86_64-apple-darwin + name: css-modules-hash.darwin-x64.node path: artifacts - name: Download macOS arm64 artifact uses: actions/download-artifact@v3 with: - name: bindings-aarch64-apple-darwin + name: css-modules-hash.darwin-arm64.node path: artifacts - name: Combine binaries run: yarn universal From 4e35715d909edb20b1755dc07db93699bd48bbdc Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 12:58:01 +0800 Subject: [PATCH 06/19] fix: ci --- .github/workflows/CI.yml | 348 +++++++++++++++++++-------------------- 1 file changed, 174 insertions(+), 174 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a0838d8..1dfea46 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -127,182 +127,182 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: bindings-${{ matrix.settings.target }} + name: ${{ env.APP_NAME }}.${{ matrix.settings.name }}.node path: ${{ env.APP_NAME }}.*.node if-no-files-found: error - test-macOS-windows-binding: - name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} - needs: - - build - strategy: - fail-fast: false - matrix: - settings: - - host: macos-latest - target: x86_64-apple-darwin - - host: windows-latest - target: x86_64-pc-windows-msvc - node: - - '16' - - '18' - runs-on: ${{ matrix.settings.host }} - steps: - - uses: actions/checkout@v3 - - name: Setup node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - check-latest: true - cache: yarn - - name: Install dependencies - run: yarn install - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: bindings-${{ matrix.settings.target }} - path: . - - name: List packages - run: ls -R . - shell: bash - - name: Test bindings - run: yarn test - test-linux-x64-gnu-binding: - name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} - needs: - - build - strategy: - fail-fast: false - matrix: - node: - - '16' - - '18' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Setup node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - check-latest: true - cache: yarn - - name: Install dependencies - run: yarn install - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: bindings-x86_64-unknown-linux-gnu - path: . - - name: List packages - run: ls -R . - shell: bash - - name: Test bindings - run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test - test-linux-x64-musl-binding: - name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }} - needs: - - build - strategy: - fail-fast: false - matrix: - node: - - '16' - - '18' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Setup node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - check-latest: true - cache: yarn - - name: Install dependencies - run: | - yarn config set supportedArchitectures.libc "musl" - yarn install - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: bindings-x86_64-unknown-linux-musl - path: . - - name: List packages - run: ls -R . - shell: bash - - name: Test bindings - run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn test - test-linux-aarch64-gnu-binding: - name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} - needs: - - build - strategy: - fail-fast: false - matrix: - node: - - '16' - - '18' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: bindings-aarch64-unknown-linux-gnu - path: . - - name: List packages - run: ls -R . - shell: bash - - name: Install dependencies - run: | - yarn config set supportedArchitectures.cpu "arm64" - yarn config set supportedArchitectures.libc "glibc" - yarn install - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: arm64 - - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - name: Setup and run tests - uses: addnab/docker-run-action@v3 - with: - image: node:${{ matrix.node }}-slim - options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' - run: | - set -e - yarn test - ls -la - test-linux-aarch64-musl-binding: - name: Test bindings on aarch64-unknown-linux-musl - node@lts - needs: - - build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: bindings-aarch64-unknown-linux-musl - path: . - - name: List packages - run: ls -R . - shell: bash - - name: Install dependencies - run: | - yarn config set supportedArchitectures.cpu "arm64" - yarn config set supportedArchitectures.libc "musl" - yarn install - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: arm64 - - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - name: Setup and run tests - uses: addnab/docker-run-action@v3 - with: - image: node:lts-alpine - options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' - run: | - set -e - yarn test + # test-macOS-windows-binding: + # name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} + # needs: + # - build + # strategy: + # fail-fast: false + # matrix: + # settings: + # - host: macos-latest + # target: x86_64-apple-darwin + # - host: windows-latest + # target: x86_64-pc-windows-msvc + # node: + # - '16' + # - '18' + # runs-on: ${{ matrix.settings.host }} + # steps: + # - uses: actions/checkout@v3 + # - name: Setup node + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.node }} + # check-latest: true + # cache: yarn + # - name: Install dependencies + # run: yarn install + # - name: Download artifacts + # uses: actions/download-artifact@v3 + # with: + # name: bindings-${{ matrix.settings.target }} + # path: . + # - name: List packages + # run: ls -R . + # shell: bash + # - name: Test bindings + # run: yarn test + # test-linux-x64-gnu-binding: + # name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} + # needs: + # - build + # strategy: + # fail-fast: false + # matrix: + # node: + # - '16' + # - '18' + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Setup node + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.node }} + # check-latest: true + # cache: yarn + # - name: Install dependencies + # run: yarn install + # - name: Download artifacts + # uses: actions/download-artifact@v3 + # with: + # name: bindings-x86_64-unknown-linux-gnu + # path: . + # - name: List packages + # run: ls -R . + # shell: bash + # - name: Test bindings + # run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test + # test-linux-x64-musl-binding: + # name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }} + # needs: + # - build + # strategy: + # fail-fast: false + # matrix: + # node: + # - '16' + # - '18' + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Setup node + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.node }} + # check-latest: true + # cache: yarn + # - name: Install dependencies + # run: | + # yarn config set supportedArchitectures.libc "musl" + # yarn install + # - name: Download artifacts + # uses: actions/download-artifact@v3 + # with: + # name: bindings-x86_64-unknown-linux-musl + # path: . + # - name: List packages + # run: ls -R . + # shell: bash + # - name: Test bindings + # run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn test + # test-linux-aarch64-gnu-binding: + # name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} + # needs: + # - build + # strategy: + # fail-fast: false + # matrix: + # node: + # - '16' + # - '18' + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Download artifacts + # uses: actions/download-artifact@v3 + # with: + # name: bindings-aarch64-unknown-linux-gnu + # path: . + # - name: List packages + # run: ls -R . + # shell: bash + # - name: Install dependencies + # run: | + # yarn config set supportedArchitectures.cpu "arm64" + # yarn config set supportedArchitectures.libc "glibc" + # yarn install + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 + # with: + # platforms: arm64 + # - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + # - name: Setup and run tests + # uses: addnab/docker-run-action@v3 + # with: + # image: node:${{ matrix.node }}-slim + # options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' + # run: | + # set -e + # yarn test + # ls -la + # test-linux-aarch64-musl-binding: + # name: Test bindings on aarch64-unknown-linux-musl - node@lts + # needs: + # - build + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Download artifacts + # uses: actions/download-artifact@v3 + # with: + # name: bindings-aarch64-unknown-linux-musl + # path: . + # - name: List packages + # run: ls -R . + # shell: bash + # - name: Install dependencies + # run: | + # yarn config set supportedArchitectures.cpu "arm64" + # yarn config set supportedArchitectures.libc "musl" + # yarn install + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 + # with: + # platforms: arm64 + # - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + # - name: Setup and run tests + # uses: addnab/docker-run-action@v3 + # with: + # image: node:lts-alpine + # options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' + # run: | + # set -e + # yarn test universal-macOS: name: Build universal macOS binary needs: From 7bec5b49b511eb829c943051e7a74fcc2c498ab7 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 12:59:12 +0800 Subject: [PATCH 07/19] fix: ci --- .github/workflows/CI.yml | 346 +++++++++++++++++++-------------------- 1 file changed, 173 insertions(+), 173 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1dfea46..f5ae1d2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -130,179 +130,179 @@ jobs: name: ${{ env.APP_NAME }}.${{ matrix.settings.name }}.node path: ${{ env.APP_NAME }}.*.node if-no-files-found: error - # test-macOS-windows-binding: - # name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} - # needs: - # - build - # strategy: - # fail-fast: false - # matrix: - # settings: - # - host: macos-latest - # target: x86_64-apple-darwin - # - host: windows-latest - # target: x86_64-pc-windows-msvc - # node: - # - '16' - # - '18' - # runs-on: ${{ matrix.settings.host }} - # steps: - # - uses: actions/checkout@v3 - # - name: Setup node - # uses: actions/setup-node@v3 - # with: - # node-version: ${{ matrix.node }} - # check-latest: true - # cache: yarn - # - name: Install dependencies - # run: yarn install - # - name: Download artifacts - # uses: actions/download-artifact@v3 - # with: - # name: bindings-${{ matrix.settings.target }} - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Test bindings - # run: yarn test - # test-linux-x64-gnu-binding: - # name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} - # needs: - # - build - # strategy: - # fail-fast: false - # matrix: - # node: - # - '16' - # - '18' - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - name: Setup node - # uses: actions/setup-node@v3 - # with: - # node-version: ${{ matrix.node }} - # check-latest: true - # cache: yarn - # - name: Install dependencies - # run: yarn install - # - name: Download artifacts - # uses: actions/download-artifact@v3 - # with: - # name: bindings-x86_64-unknown-linux-gnu - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Test bindings - # run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test - # test-linux-x64-musl-binding: - # name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }} - # needs: - # - build - # strategy: - # fail-fast: false - # matrix: - # node: - # - '16' - # - '18' - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - name: Setup node - # uses: actions/setup-node@v3 - # with: - # node-version: ${{ matrix.node }} - # check-latest: true - # cache: yarn - # - name: Install dependencies - # run: | - # yarn config set supportedArchitectures.libc "musl" - # yarn install - # - name: Download artifacts - # uses: actions/download-artifact@v3 - # with: - # name: bindings-x86_64-unknown-linux-musl - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Test bindings - # run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn test - # test-linux-aarch64-gnu-binding: - # name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} - # needs: - # - build - # strategy: - # fail-fast: false - # matrix: - # node: - # - '16' - # - '18' - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - name: Download artifacts - # uses: actions/download-artifact@v3 - # with: - # name: bindings-aarch64-unknown-linux-gnu - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Install dependencies - # run: | - # yarn config set supportedArchitectures.cpu "arm64" - # yarn config set supportedArchitectures.libc "glibc" - # yarn install - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - # with: - # platforms: arm64 - # - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - # - name: Setup and run tests - # uses: addnab/docker-run-action@v3 - # with: - # image: node:${{ matrix.node }}-slim - # options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' - # run: | - # set -e - # yarn test - # ls -la - # test-linux-aarch64-musl-binding: - # name: Test bindings on aarch64-unknown-linux-musl - node@lts - # needs: - # - build - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - name: Download artifacts - # uses: actions/download-artifact@v3 - # with: - # name: bindings-aarch64-unknown-linux-musl - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Install dependencies - # run: | - # yarn config set supportedArchitectures.cpu "arm64" - # yarn config set supportedArchitectures.libc "musl" - # yarn install - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - # with: - # platforms: arm64 - # - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - # - name: Setup and run tests - # uses: addnab/docker-run-action@v3 - # with: - # image: node:lts-alpine - # options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' - # run: | - # set -e - # yarn test + test-macOS-windows-binding: + name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + settings: + - host: macos-latest + target: x86_64-apple-darwin + - host: windows-latest + target: x86_64-pc-windows-msvc + node: + - '16' + - '18' + runs-on: ${{ matrix.settings.host }} + steps: + - uses: actions/checkout@v3 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + check-latest: true + cache: yarn + - name: Install dependencies + run: yarn install + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: bindings-${{ matrix.settings.target }} + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Test bindings + run: yarn test + test-linux-x64-gnu-binding: + name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + node: + - '16' + - '18' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + check-latest: true + cache: yarn + - name: Install dependencies + run: yarn install + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: bindings-x86_64-unknown-linux-gnu + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Test bindings + run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test + test-linux-x64-musl-binding: + name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + node: + - '16' + - '18' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + check-latest: true + cache: yarn + - name: Install dependencies + run: | + yarn config set supportedArchitectures.libc "musl" + yarn install + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: bindings-x86_64-unknown-linux-musl + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Test bindings + run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn test + test-linux-aarch64-gnu-binding: + name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + node: + - '16' + - '18' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: bindings-aarch64-unknown-linux-gnu + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Install dependencies + run: | + yarn config set supportedArchitectures.cpu "arm64" + yarn config set supportedArchitectures.libc "glibc" + yarn install + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: arm64 + - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - name: Setup and run tests + uses: addnab/docker-run-action@v3 + with: + image: node:${{ matrix.node }}-slim + options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' + run: | + set -e + yarn test + ls -la + test-linux-aarch64-musl-binding: + name: Test bindings on aarch64-unknown-linux-musl - node@lts + needs: + - build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: bindings-aarch64-unknown-linux-musl + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Install dependencies + run: | + yarn config set supportedArchitectures.cpu "arm64" + yarn config set supportedArchitectures.libc "musl" + yarn install + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: arm64 + - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - name: Setup and run tests + uses: addnab/docker-run-action@v3 + with: + image: node:lts-alpine + options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' + run: | + set -e + yarn test universal-macOS: name: Build universal macOS binary needs: From 8353e1d8f5457a4c91c9384cd067f91f39444041 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 13:31:25 +0800 Subject: [PATCH 08/19] fix: ci --- .github/workflows/CI.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f5ae1d2..4bdb137 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -26,11 +26,13 @@ jobs: matrix: settings: - host: macos-latest + name: darwin-x64 target: x86_64-apple-darwin build: | yarn build strip -x *.node - host: windows-latest + name: win32-x64-msvc build: yarn build target: x86_64-pc-windows-msvc - host: windows-latest @@ -38,6 +40,7 @@ jobs: name: win32-ia32-msvc build: yarn build --target i686-pc-windows-msvc - host: ubuntu-latest + name: linux-x64-gnu target: x86_64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian build: |- @@ -45,6 +48,7 @@ jobs: yarn build --target x86_64-unknown-linux-gnu && strip *.node - host: ubuntu-latest + name: linux-x64-musl target: x86_64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine build: set -e && yarn build && strip *.node @@ -70,10 +74,12 @@ jobs: /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node - host: macos-latest target: aarch64-apple-darwin + name: darwin-arm64 build: | yarn build --target aarch64-apple-darwin strip -x *.node - host: windows-latest + name: win32-arm64-msvc target: aarch64-pc-windows-msvc build: yarn build --target aarch64-pc-windows-msvc name: stable - ${{ matrix.settings.target }} - node@18 @@ -140,8 +146,10 @@ jobs: settings: - host: macos-latest target: x86_64-apple-darwin + name: darwin-x64 - host: windows-latest target: x86_64-pc-windows-msvc + name: win32-x64-msvc node: - '16' - '18' @@ -159,7 +167,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: bindings-${{ matrix.settings.target }} + name: ${{ env.APP_NAME }}.${{ matrix.settings.name }}.node path: . - name: List packages run: ls -R . From d1e5d5953bacea05812853868c1d7a51ddf6b73f Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 13:41:30 +0800 Subject: [PATCH 09/19] fix: ci --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4bdb137..72b9dad 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -330,18 +330,18 @@ jobs: uses: actions/download-artifact@v3 with: name: css-modules-hash.darwin-x64.node - path: artifacts + path: . - name: Download macOS arm64 artifact uses: actions/download-artifact@v3 with: name: css-modules-hash.darwin-arm64.node - path: artifacts + path: . - name: Combine binaries run: yarn universal - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: bindings-universal-apple-darwin + name: ${{ env.APP_NAME }}.darwin-universal.node path: ${{ env.APP_NAME }}.*.node if-no-files-found: error publish: From 8d6e70c0487e0699008a22d784e81805e44a23ba Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 13:48:49 +0800 Subject: [PATCH 10/19] fix: ci --- .github/workflows/CI.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 72b9dad..df36251 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -330,12 +330,15 @@ jobs: uses: actions/download-artifact@v3 with: name: css-modules-hash.darwin-x64.node - path: . + path: artifacts - name: Download macOS arm64 artifact uses: actions/download-artifact@v3 with: name: css-modules-hash.darwin-arm64.node - path: . + path: artifacts + - name: List packages + run: ls -R . + shell: bash - name: Combine binaries run: yarn universal - name: Upload artifact From a50fd00096a3489dd685c10ab0b42e5bcdf97dda Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 13:55:30 +0800 Subject: [PATCH 11/19] fix: ci --- .github/workflows/CI.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index df36251..04660d5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -329,15 +329,18 @@ jobs: - name: Download macOS x64 artifact uses: actions/download-artifact@v3 with: - name: css-modules-hash.darwin-x64.node + name: ${{ env.APP_NAME }}.darwin-x64.node path: artifacts + - name: List packages + run: ls artifacts/ + shell: bash - name: Download macOS arm64 artifact uses: actions/download-artifact@v3 with: - name: css-modules-hash.darwin-arm64.node + name: ${{ env.APP_NAME }}.darwin-arm64.node path: artifacts - name: List packages - run: ls -R . + run: ls artifacts/ shell: bash - name: Combine binaries run: yarn universal From a047e6f050f9c61a456cd2f00700a7d26ed44fda Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:05:11 +0800 Subject: [PATCH 12/19] fix: ci --- .github/workflows/CI.yml | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 04660d5..e28383d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -85,7 +85,7 @@ jobs: name: stable - ${{ matrix.settings.target }} - node@18 runs-on: ${{ matrix.settings.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 if: ${{ !matrix.settings.docker }} @@ -131,7 +131,7 @@ jobs: if: ${{ !matrix.settings.docker }} shell: bash - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.APP_NAME }}.${{ matrix.settings.name }}.node path: ${{ env.APP_NAME }}.*.node @@ -155,7 +155,7 @@ jobs: - '18' runs-on: ${{ matrix.settings.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -165,7 +165,7 @@ jobs: - name: Install dependencies run: yarn install - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.APP_NAME }}.${{ matrix.settings.name }}.node path: . @@ -186,7 +186,7 @@ jobs: - '18' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -196,7 +196,7 @@ jobs: - name: Install dependencies run: yarn install - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-x86_64-unknown-linux-gnu path: . @@ -217,7 +217,7 @@ jobs: - '18' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -229,7 +229,7 @@ jobs: yarn config set supportedArchitectures.libc "musl" yarn install - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-x86_64-unknown-linux-musl path: . @@ -250,9 +250,9 @@ jobs: - '18' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-aarch64-unknown-linux-gnu path: . @@ -284,9 +284,9 @@ jobs: - build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-aarch64-unknown-linux-musl path: . @@ -317,7 +317,7 @@ jobs: - build runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -327,25 +327,25 @@ jobs: - name: Install dependencies run: yarn install - name: Download macOS x64 artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.APP_NAME }}.darwin-x64.node path: artifacts - name: List packages run: ls artifacts/ shell: bash - - name: Download macOS arm64 artifact - uses: actions/download-artifact@v3 - with: - name: ${{ env.APP_NAME }}.darwin-arm64.node - path: artifacts - - name: List packages - run: ls artifacts/ - shell: bash + # - name: Download macOS arm64 artifact + # uses: actions/download-artifact@v4 + # with: + # name: ${{ env.APP_NAME }}.darwin-arm64.node + # path: artifacts + # - name: List packages + # run: ls artifacts/ + # shell: bash - name: Combine binaries run: yarn universal - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.APP_NAME }}.darwin-universal.node path: ${{ env.APP_NAME }}.*.node @@ -361,7 +361,7 @@ jobs: - test-linux-aarch64-gnu-binding - universal-macOS steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -371,7 +371,7 @@ jobs: - name: Install dependencies run: yarn install - name: Download all artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: artifacts - name: Move artifacts From c0d66cac08f7683f1d4444655f4c72fb1c17c9ba Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:11:43 +0800 Subject: [PATCH 13/19] fix: ci --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e28383d..5bb9d5a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,7 +29,7 @@ jobs: name: darwin-x64 target: x86_64-apple-darwin build: | - yarn build + yarn build --target darwin-x64 strip -x *.node - host: windows-latest name: win32-x64-msvc From d552623e814338e1eec1df0c4c6430e377b764f4 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:16:06 +0800 Subject: [PATCH 14/19] fix: ci --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5bb9d5a..db1087d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,7 +29,7 @@ jobs: name: darwin-x64 target: x86_64-apple-darwin build: | - yarn build --target darwin-x64 + yarn build strip -x *.node - host: windows-latest name: win32-x64-msvc @@ -97,7 +97,7 @@ jobs: uses: dtolnay/rust-toolchain@stable if: ${{ !matrix.settings.docker }} with: - toolchain: stable + toolchain: nightly-2023-12-28 targets: ${{ matrix.settings.target }} - name: Cache cargo uses: actions/cache@v3 From 101b54233a66decb27a53d86bb050fad43d56cd6 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:19:46 +0800 Subject: [PATCH 15/19] fix: ci --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index db1087d..f849ee1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,7 +29,7 @@ jobs: name: darwin-x64 target: x86_64-apple-darwin build: | - yarn build + yarn build --target x86_64-apple-darwin strip -x *.node - host: windows-latest name: win32-x64-msvc From db7deb48988a2c8ac032fa96bd0b29d610b8e726 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:20:02 +0800 Subject: [PATCH 16/19] fix: ci --- rust-toolchain.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..5b494cf --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,5 @@ +[toolchain] +profile = "default" +# Use nightly for better access to the latest Rust features. +# This date is aligned to stable release dates. +channel = "nightly-2023-12-28" # v1.75.0 \ No newline at end of file From a947d6ac7b7b186a5b98f4d20a4aed0d742ee479 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:27:48 +0800 Subject: [PATCH 17/19] fix: ci --- .github/workflows/CI.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f849ee1..47a54d3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -133,7 +133,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.APP_NAME }}.${{ matrix.settings.name }}.node + name: bindings-${{ matrix.settings.target }} path: ${{ env.APP_NAME }}.*.node if-no-files-found: error test-macOS-windows-binding: @@ -167,7 +167,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v4 with: - name: ${{ env.APP_NAME }}.${{ matrix.settings.name }}.node + name: bindings-${{ matrix.settings.target }} path: . - name: List packages run: ls -R . @@ -329,25 +329,19 @@ jobs: - name: Download macOS x64 artifact uses: actions/download-artifact@v4 with: - name: ${{ env.APP_NAME }}.darwin-x64.node + name: bindings-x86_64-apple-darwin + path: artifacts + - name: Download macOS arm64 artifact + uses: actions/download-artifact@v4 + with: + name: bindings-aarch64-apple-darwin path: artifacts - - name: List packages - run: ls artifacts/ - shell: bash - # - name: Download macOS arm64 artifact - # uses: actions/download-artifact@v4 - # with: - # name: ${{ env.APP_NAME }}.darwin-arm64.node - # path: artifacts - # - name: List packages - # run: ls artifacts/ - # shell: bash - name: Combine binaries run: yarn universal - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.APP_NAME }}.darwin-universal.node + name: bindings-universal-apple-darwin path: ${{ env.APP_NAME }}.*.node if-no-files-found: error publish: From 94a3cef885a83b2440d764f2c35a623bb690c11a Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:37:25 +0800 Subject: [PATCH 18/19] fix: ci --- .github/workflows/CI.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 47a54d3..000986e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -144,9 +144,6 @@ jobs: fail-fast: false matrix: settings: - - host: macos-latest - target: x86_64-apple-darwin - name: darwin-x64 - host: windows-latest target: x86_64-pc-windows-msvc name: win32-x64-msvc From a3f60eaf869278f761218f364f956eadad0e4a86 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 9 May 2024 14:48:24 +0800 Subject: [PATCH 19/19] fix: update ci branch --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 000986e..3aba03b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,7 +9,7 @@ permissions: 'on': push: branches: - - fix/stable-ci + - stable/css-modules-hash tags-ignore: - '**' paths-ignore: