From b6c711382cfd9ccf4d5fd4120728a44f7d47ea40 Mon Sep 17 00:00:00 2001 From: AAGaming Date: Mon, 16 Oct 2023 21:51:50 -0400 Subject: [PATCH 1/5] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bf663afe..915cf7abf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,8 @@ jobs: - 16 target: - linux/arm64 + - linux/arm/v7 + - linux/arm/v6 variant: - bullseye - alpine3.15 From 80846f41aba2554e76ce5ce69dabe35df767132d Mon Sep 17 00:00:00 2001 From: AAGaming Date: Mon, 16 Oct 2023 21:56:24 -0400 Subject: [PATCH 2/5] Update ci.yml --- .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 915cf7abf..df621b2f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,7 +123,7 @@ jobs: fail-fast: false matrix: node: - - 16 + - 18 target: - linux/arm64 - linux/arm/v7 @@ -135,7 +135,7 @@ jobs: # musl x64 builds - target: linux/amd64 variant: alpine3.15 - node: 16 + node: 18 name: ${{ matrix.variant }} (node=${{ matrix.node }}, target=${{ matrix.target }}) steps: - uses: actions/checkout@v3 From 802d8fec21ce4fb8a2f9d54d085a84cb722a5290 Mon Sep 17 00:00:00 2001 From: AAGaming Date: Mon, 16 Oct 2023 21:58:25 -0400 Subject: [PATCH 3/5] Update BinaryBuilder.Dockerfile --- BinaryBuilder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BinaryBuilder.Dockerfile b/BinaryBuilder.Dockerfile index 462e8def0..07d7c7285 100644 --- a/BinaryBuilder.Dockerfile +++ b/BinaryBuilder.Dockerfile @@ -1,6 +1,6 @@ ARG NODE_VERSION=12 ARG VARIANT=stretch -FROM node:$NODE_VERSION-$VARIANT +FROM arm32v6/node:$NODE_VERSION-$VARIANT ARG VARIANT ARG AWS_ACCESS_KEY_ID=SKIP From 4d63dace592ad2eabaeb0e265bcddce6b2b119af Mon Sep 17 00:00:00 2001 From: AAGaming Date: Mon, 16 Oct 2023 21:58:51 -0400 Subject: [PATCH 4/5] Update ci.yml --- .github/workflows/ci.yml | 220 +++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df621b2f1..c6073dba9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,109 +13,109 @@ concurrency: group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - macos-latest - - ubuntu-20.04 - - windows-latest - host: - - x64 - target: - - x64 - node: - - 10 - - 12 - - 13 - - 14 - - 15 - - 16 - - 17 - - 18 - include: - - os: windows-latest - node: 16 - host: x86 - target: x86 - - os: macos-m1 - node: 16 - host: arm64 - target: arm64 - name: ${{ matrix.os }} (node=${{ matrix.node }}, host=${{ matrix.host }}, target=${{ matrix.target }}) - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - architecture: ${{ matrix.host }} - - - name: Add yarn (self-hosted) - if: matrix.os == 'macos-m1' - run: npm install -g yarn - - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.3 - if: contains(matrix.os, 'windows') - with: - msbuild-architecture: ${{ matrix.target }} - - - name: Install dependencies - run: yarn install --ignore-scripts - - - name: Add env vars - shell: bash - run: | - echo "V=1" >> $GITHUB_ENV - - if [ "${{ matrix.target }}" = "x86" ]; then - echo "TARGET=ia32" >> $GITHUB_ENV - else - echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV - fi - - - name: Add Linux env vars - if: contains(matrix.os, 'ubuntu') - run: | - echo "CFLAGS=${CFLAGS:-} -include ../src/gcc-preinclude.h" >> $GITHUB_ENV - echo "CXXFLAGS=${CXXFLAGS:-} -include ../src/gcc-preinclude.h" >> $GITHUB_ENV - - - name: Configure build - run: yarn node-pre-gyp configure --target_arch=${{ env.TARGET }} - - - name: Build binaries - run: yarn node-pre-gyp build --target_arch=${{ env.TARGET }} - - - name: Print binary info - if: contains(matrix.os, 'ubuntu') - run: | - ldd lib/binding/*/node_sqlite3.node - echo "---" - nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true - echo "---" - file lib/binding/napi-v*/* - - - name: Run tests - run: yarn test - - - name: Package prebuilt binaries - run: yarn node-pre-gyp package --target_arch=${{ env.TARGET }} - - - name: Upload binaries to commit artifacts - uses: actions/upload-artifact@v3 - if: matrix.node == 16 - with: - name: prebuilt-binaries - path: build/stage/*/* - retention-days: 7 - - - name: Upload binaries to GitHub Release - run: yarn node-pre-gyp-github publish - if: matrix.node == 16 && startsWith(github.ref, 'refs/tags/') - env: - NODE_PRE_GYP_GITHUB_TOKEN: ${{ github.token }} + # build: + # runs-on: ${{ matrix.os }} + # strategy: + # fail-fast: false + # matrix: + # os: + # - macos-latest + # - ubuntu-20.04 + # - windows-latest + # host: + # - x64 + # target: + # - x64 + # node: + # - 10 + # - 12 + # - 13 + # - 14 + # - 15 + # - 16 + # - 17 + # - 18 + # include: + # - os: windows-latest + # node: 16 + # host: x86 + # target: x86 + # - os: macos-m1 + # node: 16 + # host: arm64 + # target: arm64 + # name: ${{ matrix.os }} (node=${{ matrix.node }}, host=${{ matrix.host }}, target=${{ matrix.target }}) + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.node }} + # architecture: ${{ matrix.host }} + + # - name: Add yarn (self-hosted) + # if: matrix.os == 'macos-m1' + # run: npm install -g yarn + + # - name: Add msbuild to PATH + # uses: microsoft/setup-msbuild@v1.3 + # if: contains(matrix.os, 'windows') + # with: + # msbuild-architecture: ${{ matrix.target }} + + # - name: Install dependencies + # run: yarn install --ignore-scripts + + # - name: Add env vars + # shell: bash + # run: | + # echo "V=1" >> $GITHUB_ENV + + # if [ "${{ matrix.target }}" = "x86" ]; then + # echo "TARGET=ia32" >> $GITHUB_ENV + # else + # echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV + # fi + + # - name: Add Linux env vars + # if: contains(matrix.os, 'ubuntu') + # run: | + # echo "CFLAGS=${CFLAGS:-} -include ../src/gcc-preinclude.h" >> $GITHUB_ENV + # echo "CXXFLAGS=${CXXFLAGS:-} -include ../src/gcc-preinclude.h" >> $GITHUB_ENV + + # - name: Configure build + # run: yarn node-pre-gyp configure --target_arch=${{ env.TARGET }} + + # - name: Build binaries + # run: yarn node-pre-gyp build --target_arch=${{ env.TARGET }} + + # - name: Print binary info + # if: contains(matrix.os, 'ubuntu') + # run: | + # ldd lib/binding/*/node_sqlite3.node + # echo "---" + # nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true + # echo "---" + # file lib/binding/napi-v*/* + + # - name: Run tests + # run: yarn test + + # - name: Package prebuilt binaries + # run: yarn node-pre-gyp package --target_arch=${{ env.TARGET }} + + # - name: Upload binaries to commit artifacts + # uses: actions/upload-artifact@v3 + # if: matrix.node == 16 + # with: + # name: prebuilt-binaries + # path: build/stage/*/* + # retention-days: 7 + + # - name: Upload binaries to GitHub Release + # run: yarn node-pre-gyp-github publish + # if: matrix.node == 16 && startsWith(github.ref, 'refs/tags/') + # env: + # NODE_PRE_GYP_GITHUB_TOKEN: ${{ github.token }} build-qemu: runs-on: ubuntu-latest if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/') @@ -125,17 +125,17 @@ jobs: node: - 18 target: - - linux/arm64 - - linux/arm/v7 + # - linux/arm64 + # - linux/arm/v7 - linux/arm/v6 variant: - bullseye - alpine3.15 - include: - # musl x64 builds - - target: linux/amd64 - variant: alpine3.15 - node: 18 + # include: + # # musl x64 builds + # - target: linux/amd64 + # variant: alpine3.15 + # node: 18 name: ${{ matrix.variant }} (node=${{ matrix.node }}, target=${{ matrix.target }}) steps: - uses: actions/checkout@v3 From 0364da21cbab1b04fee0a7b3a87352d101760f4f Mon Sep 17 00:00:00 2001 From: AAGaming Date: Mon, 16 Oct 2023 22:00:34 -0400 Subject: [PATCH 5/5] Update BinaryBuilder.Dockerfile --- tools/BinaryBuilder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/BinaryBuilder.Dockerfile b/tools/BinaryBuilder.Dockerfile index 4760dabca..306981970 100644 --- a/tools/BinaryBuilder.Dockerfile +++ b/tools/BinaryBuilder.Dockerfile @@ -1,7 +1,7 @@ ARG NODE_VERSION=16 ARG VARIANT=bullseye -FROM node:$NODE_VERSION-$VARIANT +FROM arm32v6/node:$NODE_VERSION-$VARIANT ARG VARIANT