From 6d1e6a2c417fad0cb761d802b0b7579d5323b0de Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Tue, 31 Aug 2021 08:30:02 +0300 Subject: [PATCH] Test build on macOS/arm64 (#3695) * test build on macos arm64 Signed-off-by: Jari Kolehmainen * fix syntax Signed-off-by: Jari Kolehmainen * fix syntax Signed-off-by: Jari Kolehmainen * clean first Signed-off-by: Jari Kolehmainen * node-gyp 7.1.2 Signed-off-by: Jari Kolehmainen * test Signed-off-by: Jari Kolehmainen * test Signed-off-by: Jari Kolehmainen * cleanup Signed-off-by: Jari Kolehmainen --- .github/workflows/test.yml | 9 ++++++++- package.json | 1 + yarn.lock | 28 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3058f28fe0..63d37871cd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-16.04, macos-10.15, windows-2019] + os: [ubuntu-16.04, macos-11, windows-2019] node-version: [14.x] steps: - name: Checkout Release from lens @@ -86,3 +86,10 @@ jobs: name: Run integration tests shell: bash if: runner.os != 'Linux' + + - run: make build + name: Test build (arm64) + shell: bash + env: + BINARY_ARCH: arm64 + if: runner.os == 'macOS' diff --git a/package.json b/package.json index 47d8ab915f..f016a896b3 100644 --- a/package.json +++ b/package.json @@ -353,6 +353,7 @@ "jest-mock-extended": "^1.0.16", "make-plural": "^6.2.2", "mini-css-extract-plugin": "^1.6.0", + "node-gyp": "7.1.2", "node-loader": "^1.0.3", "node-sass": "^4.14.1", "nodemon": "^2.0.12", diff --git a/yarn.lock b/yarn.lock index 5adb52ce87..c9d81d9a9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6846,6 +6846,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +graceful-fs@^4.2.3: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" @@ -10001,6 +10006,22 @@ node-forge@^0.8.2: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.5.tgz#57906f07614dc72762c84cef442f427c0e1b86ee" integrity sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q== +node-gyp@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" + integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.3" + nopt "^5.0.0" + npmlog "^4.1.2" + request "^2.88.2" + rimraf "^3.0.2" + semver "^7.3.2" + tar "^6.0.2" + which "^2.0.2" + node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" @@ -10156,6 +10177,13 @@ nopt@^4.0.1, nopt@^4.0.3: abbrev "1" osenv "^0.1.4" +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + nopt@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"