From dcf08dbfb11d995facb0226b7366bc088fb58eb1 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Sat, 5 Nov 2022 19:32:01 -0400 Subject: [PATCH 1/8] Fix the libzim8 build --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index 790ba09..72c8446 100644 --- a/binding.gyp +++ b/binding.gyp @@ -24,7 +24,7 @@ "libraries": [ "-Wl,-rpath,'$$ORIGIN'", "-L<(libzim_dir)/lib/x86_64-linux-gnu", - "<(libzim_dir)/lib/x86_64-linux-gnu/libzim.so.7", + "<(libzim_dir)/lib/x86_64-linux-gnu/libzim.so.8", ], }], ["libzim_local!='true' and OS=='mac'", { From dd14b0a682619604251cf79271e0919f6af8371d Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 1 Dec 2022 12:32:11 +0100 Subject: [PATCH 2/8] Use libzim 8.1.0 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index ea15b36..e0593f7 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -LIBZIM_VERSION=8.0.0 +LIBZIM_VERSION=8.1.0 From 22e9410c3058b514e1c4bbba671ac7ae92351751 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 1 Dec 2022 12:33:16 +0100 Subject: [PATCH 3/8] Use only Node.js 16 & 18 in 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 9ce1b0d..ca9e09e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node-version: [14.x, 16.x, 17.x] + node-version: [16, 18] steps: - uses: actions/checkout@v2 @@ -47,7 +47,7 @@ jobs: strategy: matrix: - node-version: [14.x, 16.x, 17.x] + node-version: [16, 18] steps: - uses: actions/checkout@v2 @@ -76,7 +76,7 @@ jobs: strategy: matrix: - node-version: [14.x, 16.x, 17.x] + node-version: [16, 18] steps: - uses: actions/checkout@v2 From 895c7e27608b9f058ac7bac5f431eb45f264ca7f Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 1 Dec 2022 12:41:33 +0100 Subject: [PATCH 4/8] Replace Ubuntu 18.04 by 22.04 in CI --- .github/workflows/ci.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca9e09e..75aa420 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,8 @@ jobs: - name: running test run: npm run test - Ubuntu-Bionic: - runs-on: ubuntu-18.04 + Ubuntu-Focal: + runs-on: ubuntu-20.04 strategy: matrix: @@ -68,11 +68,22 @@ jobs: - name: installing typescript run: npm i -g typescript + - name: installing codecov + run: npm i codecov + - name: running test run: npm run test - Ubuntu-Focal: - runs-on: ubuntu-20.04 + - name: running codecov + run: npm run codecov + + - name: codecov action + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + + Ubuntu-Jammy: + runs-on: ubuntu-22.04 strategy: matrix: From 797e25440eb2d2cda3ebf0526b150e73b9f33f50 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 1 Dec 2022 12:45:40 +0100 Subject: [PATCH 5/8] Avoid CI execution duplicates --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75aa420..211030a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,10 @@ name: CI on: - push: - branches: [ master ] pull_request: + push: + branches: + - master jobs: From 80ee0b9f5dc162f0deed989f60779535164a4114 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 1 Dec 2022 12:51:33 +0100 Subject: [PATCH 6/8] Use proper version of libzim dynlib --- bundle-libzim.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle-libzim.js b/bundle-libzim.js index 603a5d3..6d45bcb 100644 --- a/bundle-libzim.js +++ b/bundle-libzim.js @@ -13,14 +13,14 @@ if (!isMacOS && !isLinux) { } if (isLinux) { - console.info(`Copying libzim.so.7 to build folder`) - exec(`cp download/lib/x86_64-linux-gnu/libzim.so.7 build/Release/libzim.so.7`) - exec(`ln -sf build/Release/libzim.so.7 build/Release/libzim.so`) // convienience only, not required + console.info(`Copying libzim.so.8 to build folder`) + exec(`cp download/lib/x86_64-linux-gnu/libzim.so.8 build/Release/libzim.so.8`) + exec(`ln -sf build/Release/libzim.so.8 build/Release/libzim.so`) // convienience only, not required } if (isMacOS) { - console.info(`Copying libzim.7.dylib to build folder`); - exec(`cp download/lib/libzim.7.dylib build/Release/libzim.7.dylib`) - exec(`ln -sf build/Release/libzim.7.dylib build/Release/libzim.dylib`) // convienience only, not required + console.info(`Copying libzim.8.dylib to build folder`); + exec(`cp download/lib/libzim.8.dylib build/Release/libzim.8.dylib`) + exec(`ln -sf build/Release/libzim.8.dylib build/Release/libzim.dylib`) // convienience only, not required console.info(`Fixing rpath`) - exec(`install_name_tool -change libzim.7.dylib @loader_path/libzim.7.dylib build/Release/zim_binding.node`) + exec(`install_name_tool -change libzim.8.dylib @loader_path/libzim.8.dylib build/Release/zim_binding.node`) } From 8e8087e07517b28e2b76a336bf3f4a985908ebbe Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 1 Dec 2022 12:54:39 +0100 Subject: [PATCH 7/8] Use v3 of actions/checkout --- .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 211030a..cdab744 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: node-version: [16, 18] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 @@ -51,7 +51,7 @@ jobs: node-version: [16, 18] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -91,7 +91,7 @@ jobs: node-version: [16, 18] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: From 17745055748a72a3231ead942a24a0c25f3c3229 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 1 Dec 2022 13:01:22 +0100 Subject: [PATCH 8/8] Use Python 3.10 in CI (macOS) --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdab744..e87365d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,17 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 - - - name: Setup python 3.6 - uses: actions/setup-python@v1 with: node-version: ${{ matrix.node-version }} + - name: Setup python 3.10 + uses: actions/setup-python@v4 + with: + python-version: '3.10' + - name: installing add on packages run: brew install ossp-uuid @@ -52,6 +55,7 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -92,6 +96,7 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: