From 7ba63ac77453926b8c0adecb4a9c4cbb67a36424 Mon Sep 17 00:00:00 2001 From: Momtchil Momtchev Date: Mon, 17 Jun 2024 17:36:05 +0200 Subject: [PATCH 1/2] upgrade all actions to use macos-12 --- .github/workflows/publish.yml | 2 +- .github/workflows/test-dev.yml | 4 ++-- .github/workflows/test-npm.yml | 4 ++-- .github/workflows/test-release.yml | 2 +- CHANGELOG.md | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9f4f180e6..27d706830 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ jobs: strategy: matrix: node-version: [ 16.x, 18.x, 20.x, 21.x ] - platforms: [ windows-2019, macos-11 ] + platforms: [ windows-2019, macos-12 ] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml index cfb332223..79d569a30 100644 --- a/.github/workflows/test-dev.yml +++ b/.github/workflows/test-dev.yml @@ -149,7 +149,7 @@ jobs: test_mac: - runs-on: macos-11 + runs-on: macos-12 strategy: matrix: @@ -186,7 +186,7 @@ jobs: test_mac_debug: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml index 0f5943476..714efa728 100644 --- a/.github/workflows/test-npm.yml +++ b/.github/workflows/test-npm.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - platforms: [ ubuntu-20.04, ubuntu-22.04, windows-2019, macos-11 ] + platforms: [ ubuntu-22.04, ubuntu-24.04, windows-2019, macos-12 ] node-version: [ 16.x, 18.x, 20.x, 21.x ] steps: @@ -48,7 +48,7 @@ jobs: strategy: matrix: - platforms: [ ubuntu-20.04, ubuntu-22.04, windows-2019, macos-11 ] + platforms: [ ubuntu-22.04, ubuntu-24.04, windows-2019, macos-12 ] node-version: [ 16.x, 18.x, 20.x, 21.x ] steps: diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index 4695239a8..ab956aaee 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: - platforms: [ windows-2019, macos-11 ] + platforms: [ windows-2019, macos-12 ] node-version: [ 16.x, 18.x, 20.x, 21.x ] steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 358ce4f49..015594818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - All shared library symbols are now hidden on Linux, allowing to load the binary addon in a process that has loaded a different version of GDAL (on Windows this has always been possible and on maOS, while possible in theory, this particular linking mode is not supported by `node-gyp`) +### Removed + - Drop macOS 11 support + ## [3.8.5] 2024-04-09 From ccf157fd2e1d33f2a3fcf537eb8da64c8edf6e29 Mon Sep 17 00:00:00 2001 From: Momtchil Momtchev Date: Mon, 17 Jun 2024 18:51:33 +0200 Subject: [PATCH 2/2] these tests can be very slow on older macs --- test/api_rasterband.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/api_rasterband.test.ts b/test/api_rasterband.test.ts index dbe27f94b..35aa9b07c 100644 --- a/test/api_rasterband.test.ts +++ b/test/api_rasterband.test.ts @@ -617,7 +617,7 @@ describe('gdal.RasterBand', () => { assert.equal(data[10 * 20 + 10], 10) }) describe('w/data over 4GB', function () { - this.timeout(30000) + this.timeout(60000) // These tests require at least 16GB of memory to be reliable const size = 66000 it('when returning a new TypedArray', () => { @@ -1096,7 +1096,7 @@ describe('gdal.RasterBand', () => { } }) it('should not fail when writing more than 4GB', function () { - this.timeout(30000) + this.timeout(60000) if (semver.lt(gdal.version, '3.6.0')) { this.skip() }