From 728e720d010ede964dfbae340ccdf46fe92ed638 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 10:36:46 -0600 Subject: [PATCH 01/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias --- .github/workflows/build.yml | 11 +-- gulp-appdmg.js | 32 ++++++++ gulpfile.js | 8 +- package.json | 3 +- yarn.lock | 143 ++++++------------------------------ 5 files changed, 68 insertions(+), 129 deletions(-) create mode 100644 gulp-appdmg.js diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e67e94a0..682596c98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,11 +16,12 @@ jobs: build: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' timeout-minutes: 40 continue-on-error: false runs-on: ${{ matrix.os }} strategy: - fail-fast: true + fail-fast: false max-parallel: 3 matrix: os: [ubuntu-latest, macos-latest, windows-latest] @@ -29,7 +30,7 @@ jobs: shortsha: ${{ steps.ids.outputs.shortsha }} steps: - name: git checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 continue-on-error: false - name: get tag & short-sha @@ -46,9 +47,9 @@ jobs: continue-on-error: true - name: setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: '11' + node-version: '12' continue-on-error: false # for debugging @@ -67,7 +68,7 @@ jobs: # build stuff - name: yarn install - run: yarn install + run: yarn install --immutable --immutable-cache --check-cache - name: yarn gulp clean-release run: yarn gulp clean-release diff --git a/gulp-appdmg.js b/gulp-appdmg.js new file mode 100644 index 000000000..a9bd64ce0 --- /dev/null +++ b/gulp-appdmg.js @@ -0,0 +1,32 @@ +const alias = require('macos-alias'); + +const appdmg = require('appdmg'); +const through = require('through2'); +const gutil = require('gulp-util'); + +const PluginError = gutil.PluginError; +const PLUGIN_NAME = 'gulp-appdmg'; + +module.exports = function(options) { + const stream = through.obj(function(file, encoding, next) { + next(); + }, function(callback) { + const self = this; + const ee = appdmg(options); + + ee.on('progress', function(info) { + gutil.log(`${info.current}/${info.total} ${info.type} ${info.title || info.status}`); + }); + + ee.on('error', function(err) { + self.emit('error', new PluginError(PLUGIN_NAME, err)); + callback(); + }); + + ee.on('finish', callback); + }); + + // returning the file stream + stream.resume(); + return stream; +}; diff --git a/gulpfile.js b/gulpfile.js index 4573c248d..26420d463 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -285,6 +285,7 @@ function dist_resources() { function apps(done) { var platforms = getPlatforms(); removeItem(platforms, 'chromeos'); + removeItem(platforms, 'android'); buildNWAppsWrapper(platforms, 'normal', APPS_DIR, done); } @@ -676,7 +677,7 @@ function release_osx64() { console.log('running locally - skipping signing of app'); } - var appdmg = require('gulp-appdmg'); + const appdmg = require('./gulp-appdmg'); // The appdmg does not generate the folder correctly, manually createDirIfNotExists(RELEASE_DIR); @@ -697,14 +698,15 @@ function release_osx64() { ], background: path.join(__dirname, 'assets/osx/dmg-background.png'), - format: 'UDBZ', + format: 'UDZO', window: { size: { width: 755, height: 755 } }, - 'code-sign': { 'signing-identity': process.env.APP_IDENTITY } + // code-signing requirement is failing, we no longer code-sign anyway so remove it. + //'code-sign': { 'signing-identity': process.env.APP_IDENTITY } }, }) ); diff --git a/package.json b/package.json index b2e230fab..b5e8837ff 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,7 @@ "yarn": "^1.22.15" }, "optionalDependencies": { - "gulp-appdmg": "^1.0.3" + "appdmg": "^0.6.4", + "macos-alias": "^0.2.11" } } diff --git a/yarn.lock b/yarn.lock index 61788b678..7df510875 100644 --- a/yarn.lock +++ b/yarn.lock @@ -234,27 +234,27 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -appdmg@0.4.5: - version "0.4.5" - resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.4.5.tgz#47a827865b8a0be48abb3522567e3493d2f1b838" - integrity sha1-R6gnhluKC+SKuzUiVn40k9LxuDg= +appdmg@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.6.0.tgz#81b3beab624ab458e6104d87c5cfa4b172203821" + integrity sha512-vDz8cMf5c6BfoS72OmmHzzuxG5DFVDM6YCAkscjYh3GASGEBBRCZ10Bn515ZPSPHOpfI9Xu3MlApbd49C58pJg== dependencies: async "^1.4.2" - cp-file "^3.1.0" ds-store "^0.1.5" - execa "^0.4.0" + execa "^1.0.0" fs-temp "^1.0.0" - fs-xattr "^0.1.14" - image-size "^0.5.0" - is-my-json-valid "^2.13.1" + fs-xattr "^0.3.0" + image-size "^0.7.4" + is-my-json-valid "^2.20.0" minimist "^1.1.3" parse-color "^1.0.0" + path-exists "^4.0.0" repeat-string "^1.5.4" -appdmg@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.6.0.tgz#81b3beab624ab458e6104d87c5cfa4b172203821" - integrity sha512-vDz8cMf5c6BfoS72OmmHzzuxG5DFVDM6YCAkscjYh3GASGEBBRCZ10Bn515ZPSPHOpfI9Xu3MlApbd49C58pJg== +appdmg@^0.6.4: + version "0.6.6" + resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.6.6.tgz#d06bd82b530032fd7a8f0970a1c6ee6196e1efce" + integrity sha512-GRmFKlCG+PWbcYF4LUNonTYmy0GjguDy6Jh9WP8mpd0T6j80XIJyXBiWlD0U+MLNhqV9Nhx49Gl9GpVToulpLg== dependencies: async "^1.4.2" ds-store "^0.1.5" @@ -689,11 +689,6 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= -buffer-from@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" - integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== - buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -1138,19 +1133,6 @@ cors@~2.8.5: object-assign "^4" vary "^1" -cp-file@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-3.2.0.tgz#6f83616254624f0ad58aa4aa8d076f026be7e188" - integrity sha1-b4NhYlRiTwrViqSqjQdvAmvn4Yg= - dependencies: - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nested-error-stacks "^1.0.1" - object-assign "^4.0.1" - pify "^2.3.0" - pinkie-promise "^2.0.0" - readable-stream "^2.1.4" - crc32-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4" @@ -1173,14 +1155,6 @@ create-error-class@^3.0.0: dependencies: capture-stack-trace "^1.0.0" -cross-spawn-async@^2.1.1: - version "2.2.5" - resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc" - integrity sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= - dependencies: - lru-cache "^4.0.0" - which "^1.2.8" - cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -1652,18 +1626,6 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== -execa@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3" - integrity sha1-TrZGejaglfq7KXD/nV4/t7zm68M= - dependencies: - cross-spawn-async "^2.1.1" - is-stream "^1.1.0" - npm-run-path "^1.0.0" - object-assign "^4.0.1" - path-key "^1.0.0" - strip-eof "^1.0.0" - execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" @@ -2059,14 +2021,6 @@ fs-temp@^1.0.0: dependencies: random-path "^0.1.0" -fs-xattr@^0.1.14: - version "0.1.17" - resolved "https://registry.yarnpkg.com/fs-xattr/-/fs-xattr-0.1.17.tgz#ee943483c6fe9704a8f0e1476e8145a9886f8b0f" - integrity sha512-SpBbnN1lkSgBjELpnxnxfcl236ceCu6LnrfrT4CREsux4LP4PvKU37IpceJqAInnTTOWmeVHi9c8lKXIdfynPg== - dependencies: - buffer-from "^0.1.1" - nan "^2.3.2" - fs-xattr@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/fs-xattr/-/fs-xattr-0.3.0.tgz#019642eacc49f343061af19de4c13543895589ad" @@ -2345,15 +2299,6 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -gulp-appdmg@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/gulp-appdmg/-/gulp-appdmg-1.0.3.tgz#cd00747d7dd50803d18e91aba15eb91f9a99c6d5" - integrity sha1-zQB0fX3VCAPRjpGroV65H5qZxtU= - dependencies: - appdmg "0.4.5" - gulp-util "^3.0.5" - through2 "^0.6.5" - gulp-cli@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc" @@ -2416,7 +2361,7 @@ gulp-rename@^2.0.0: resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-2.0.0.tgz#9bbc3962b0c0f52fc67cd5eaff6c223ec5b9cf6c" integrity sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ== -gulp-util@^3.0.5, gulp-util@^3.0.8: +gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08= @@ -2648,11 +2593,6 @@ ignore@^5.1.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== -image-size@^0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= - image-size@^0.7.4: version "0.7.5" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.7.5.tgz#269f357cf5797cb44683dfa99790e54c705ead04" @@ -2887,7 +2827,7 @@ is-my-ip-valid@^1.0.0: resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ== -is-my-json-valid@^2.13.1, is-my-json-valid@^2.20.0: +is-my-json-valid@^2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz#1345a6fca3e8daefc10d0fa77067f54cedafd59a" integrity sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA== @@ -3553,7 +3493,7 @@ lowercase-keys@^1.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== -lru-cache@^4.0.0, lru-cache@^4.0.1: +lru-cache@^4.0.1: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -3566,7 +3506,7 @@ lru_map@^0.3.3: resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= -macos-alias@~0.2.5: +macos-alias@^0.2.11, macos-alias@~0.2.5: version "0.2.11" resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.11.tgz#feeea6c13ba119814a43fc43c470b31e59ef718a" integrity sha1-/u6mwTuhGYFKQ/xDxHCzHlnvcYo= @@ -3754,7 +3694,7 @@ mkdirp@0.5.1: dependencies: minimist "0.0.8" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5: +mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -3833,7 +3773,7 @@ mute-stdout@^1.0.0: resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg== -nan@^2.12.1, nan@^2.3.2, nan@^2.4.0: +nan@^2.12.1, nan@^2.4.0: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -3870,13 +3810,6 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -nested-error-stacks@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz#19f619591519f096769a5ba9a86e6eeec823c3cf" - integrity sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88= - dependencies: - inherits "~2.0.1" - next-tick@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" @@ -3934,13 +3867,6 @@ now-and-later@^2.0.0: dependencies: once "^1.3.2" -npm-run-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f" - integrity sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= - dependencies: - path-key "^1.0.0" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -4253,11 +4179,6 @@ path-is-inside@^1.0.1: resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= -path-key@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af" - integrity sha1-XVPVeAGWRsDWiADbThRua9wqx68= - path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -4321,7 +4242,7 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== -pify@^2.0.0, pify@^2.3.0: +pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= @@ -4545,17 +4466,7 @@ read-pkg@^1.0.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -"readable-stream@>=1.0.33-1 <1.1.0-0": - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -5388,14 +5299,6 @@ through2-filter@^3.0.0: through2 "~2.0.0" xtend "~4.0.0" -through2@^0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -5851,7 +5754,7 @@ which@2.0.2, which@^2.0.2: dependencies: isexe "^2.0.0" -which@^1.2.1, which@^1.2.14, which@^1.2.8, which@^1.2.9: +which@^1.2.1, which@^1.2.14, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -5957,7 +5860,7 @@ xmlbuilder@^15.1.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From 6eff9d77557915d94b8cd452811ae35c2951236a Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:06:12 -0600 Subject: [PATCH 02/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias --- gulpfile.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 26420d463..5f19379e3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -705,7 +705,6 @@ function release_osx64() { height: 755 } }, - // code-signing requirement is failing, we no longer code-sign anyway so remove it. //'code-sign': { 'signing-identity': process.env.APP_IDENTITY } }, }) From 3092fefe5a7f3f3ea24dea60e08f7781cc3fdda0 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:24:57 -0600 Subject: [PATCH 03/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 682596c98..6656a9406 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false max-parallel: 3 matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-11, windows-latest] outputs: buildtag: ${{ steps.ids.outputs.buildtag }} shortsha: ${{ steps.ids.outputs.shortsha }} From c8ad2d0ff0e00e5792403b8623b354f22211aef8 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:33:21 -0600 Subject: [PATCH 04/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias --- gulp-appdmg.js | 2 +- gulpfile.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gulp-appdmg.js b/gulp-appdmg.js index a9bd64ce0..5226cc6eb 100644 --- a/gulp-appdmg.js +++ b/gulp-appdmg.js @@ -1,4 +1,4 @@ -const alias = require('macos-alias'); +var alias = require('macos-alias'); const appdmg = require('appdmg'); const through = require('through2'); diff --git a/gulpfile.js b/gulpfile.js index 5f19379e3..7497064a7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -705,7 +705,6 @@ function release_osx64() { height: 755 } }, - //'code-sign': { 'signing-identity': process.env.APP_IDENTITY } }, }) ); From c6dcc404d6f683b54c03543ac6d8e40aff97356b Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:36:27 -0600 Subject: [PATCH 05/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias --- gulpfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/gulpfile.js b/gulpfile.js index 7497064a7..cd355145f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -677,6 +677,7 @@ function release_osx64() { console.log('running locally - skipping signing of app'); } + var alias = require('macos-alias'); const appdmg = require('./gulp-appdmg'); // The appdmg does not generate the folder correctly, manually From 926c9e4d9b1a8fe6124b04effa5fa674b2f5659d Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:44:53 -0600 Subject: [PATCH 06/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias --- .github/workflows/build.yml | 2 +- gulpfile.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6656a9406..325a00ca8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: # build stuff - name: yarn install - run: yarn install --immutable --immutable-cache --check-cache + run: yarn install - name: yarn gulp clean-release run: yarn gulp clean-release diff --git a/gulpfile.js b/gulpfile.js index cd355145f..d6b5d2585 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -677,8 +677,7 @@ function release_osx64() { console.log('running locally - skipping signing of app'); } - var alias = require('macos-alias'); - const appdmg = require('./gulp-appdmg'); + var appdmg = require('./gulp-appdmg'); // The appdmg does not generate the folder correctly, manually createDirIfNotExists(RELEASE_DIR); From 341dedcc7ff5c21f1e94e7474bb59477d1f722e3 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 12:56:20 -0600 Subject: [PATCH 07/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; remove unsused require - it is in 3rd party --- gulp-appdmg.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/gulp-appdmg.js b/gulp-appdmg.js index 5226cc6eb..17a801184 100644 --- a/gulp-appdmg.js +++ b/gulp-appdmg.js @@ -1,5 +1,3 @@ -var alias = require('macos-alias'); - const appdmg = require('appdmg'); const through = require('through2'); const gutil = require('gulp-util'); From 9eaa7d24f6246259a433a9256bf3c55af2e53faa Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:18:39 -0600 Subject: [PATCH 08/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; more annoying every time --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 325a00ca8..dc2117f02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: # build stuff - name: yarn install - run: yarn install + run: yarn install --immutable --check-cache - name: yarn gulp clean-release run: yarn gulp clean-release From d43ec4f3a82769156ab12e2098fd517d39ae504c Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:24:43 -0600 Subject: [PATCH 09/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; more annoying each and every time --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b5e8837ff..0d67e9f9a 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,7 @@ }, "optionalDependencies": { "appdmg": "^0.6.4", - "macos-alias": "^0.2.11" + "macos-alias": "^0.2.11", + "gulp-cli": "^2.3.0" } } From 0ceafe1f50f956fe14df086b42f8d9dda586569e Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:29:38 -0600 Subject: [PATCH 10/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; eff you --- .github/workflows/build.yml | 1 + gulpfile.js | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc2117f02..563f3b637 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,6 +83,7 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | + yarn install macos-alias appdmg gulp-appdmg yarn gulp release --osx64 continue-on-error: false diff --git a/gulpfile.js b/gulpfile.js index d6b5d2585..4d5f7b447 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -669,6 +669,7 @@ function getLinuxPackageArch(type, arch) { // TODO: add code-signing https://github.com/LinusU/node-appdmg // Create distribution package for macOS platform function release_osx64() { + const appdmg = require('./gulp-appdmg'); if (process.env.TRAVIS_OS_NAME == 'osx') { const { execSync } = require('child_process'); @@ -677,8 +678,6 @@ function release_osx64() { console.log('running locally - skipping signing of app'); } - var appdmg = require('./gulp-appdmg'); - // The appdmg does not generate the folder correctly, manually createDirIfNotExists(RELEASE_DIR); From 20d2e6d43bca98dab47c9b4d175bdaa1a85c14a4 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:31:34 -0600 Subject: [PATCH 11/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 563f3b637..67454133d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,7 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | - yarn install macos-alias appdmg gulp-appdmg + yarn add macos-alias appdmg gulp-appdmg yarn gulp release --osx64 continue-on-error: false From f0a7a05112e2f77b8437e1f53ecb5b20f0e98d0d Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:35:00 -0600 Subject: [PATCH 12/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0d67e9f9a..689a2b271 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,7 @@ "yarn": "^1.22.15" }, "optionalDependencies": { + "fsevents": "^2.3.3" "appdmg": "^0.6.4", "macos-alias": "^0.2.11", "gulp-cli": "^2.3.0" From ab3e29806fc0e051e1df8154ef87a1c3fb5fb3d4 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:35:25 -0600 Subject: [PATCH 13/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 689a2b271..ba5ca9be3 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "yarn": "^1.22.15" }, "optionalDependencies": { - "fsevents": "^2.3.3" + "fsevents": "^2.3.3", "appdmg": "^0.6.4", "macos-alias": "^0.2.11", "gulp-cli": "^2.3.0" From bbf352eb0e6e796b40806260e90e5ea29d1fb70b Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:38:31 -0600 Subject: [PATCH 14/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba5ca9be3..e6e484362 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "optionalDependencies": { "fsevents": "^2.3.3", "appdmg": "^0.6.4", - "macos-alias": "^0.2.11", + "macos-alias": "@0.2.5", "gulp-cli": "^2.3.0" } } From f6d76448191b8dc3ae47472956974f448592d95c Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:39:34 -0600 Subject: [PATCH 15/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6e484362..d5771f892 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "optionalDependencies": { "fsevents": "^2.3.3", "appdmg": "^0.6.4", - "macos-alias": "@0.2.5", + "macos-alias": "0.2.5", "gulp-cli": "^2.3.0" } } From cd5280cd97ddd1a2d556428c6a42776d777423c7 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:41:44 -0600 Subject: [PATCH 16/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67454133d..59c278da4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false max-parallel: 3 matrix: - os: [ubuntu-latest, macos-11, windows-latest] + os: [ubuntu-latest, macos-12, windows-latest] outputs: buildtag: ${{ steps.ids.outputs.buildtag }} shortsha: ${{ steps.ids.outputs.shortsha }} From 25b3acdadb17fbf78ffde20be9c96f3eff8a7073 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:47:04 -0600 Subject: [PATCH 17/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- .github/workflows/build.yml | 2 +- package.json | 2 +- yarn.lock | 76 ++++++++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59c278da4..69c2fbe9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: - name: setup node uses: actions/setup-node@v4 with: - node-version: '12' + node-version: '16' continue-on-error: false # for debugging diff --git a/package.json b/package.json index d5771f892..7fd3580fa 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "fs-extra": "^9.1.0", "gulp": "^4.0.2", "gulp-concat": "~2.6.1", - "gulp-debian": "~0.1.9", + "gulp-debian": "^0.3.2", "gulp-git": "^2.10.1", "gulp-rename": "^2.0.0", "gulp-yarn": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 7df510875..999385e95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1845,6 +1845,13 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find@^0.2.8: + version "0.2.9" + resolved "https://registry.yarnpkg.com/find/-/find-0.2.9.tgz#4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c" + integrity sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ== + dependencies: + traverse-chain "~0.1.0" + findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -2039,6 +2046,11 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" +fsevents@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + fsevents@~2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" @@ -2323,6 +2335,30 @@ gulp-cli@^2.2.0: v8flags "^3.0.1" yargs "^7.1.0" +gulp-cli@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f" + integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A== + dependencies: + ansi-colors "^1.0.1" + archy "^1.0.0" + array-sort "^1.0.0" + color-support "^1.1.3" + concat-stream "^1.6.0" + copy-props "^2.0.1" + fancy-log "^1.3.2" + gulplog "^1.0.0" + interpret "^1.4.0" + isobject "^3.0.1" + liftoff "^3.1.0" + matchdep "^2.0.0" + mute-stdout "^1.0.0" + pretty-hrtime "^1.0.0" + replace-homedir "^1.0.0" + semver-greatest-satisfied-range "^1.1.0" + v8flags "^3.2.0" + yargs "^7.1.0" + gulp-concat@~2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353" @@ -2332,11 +2368,12 @@ gulp-concat@~2.6.1: through2 "^2.0.0" vinyl "^2.0.0" -gulp-debian@~0.1.9: - version "0.1.9" - resolved "https://registry.yarnpkg.com/gulp-debian/-/gulp-debian-0.1.9.tgz#80e4a8cfc0f0904312f07e66a06ca3c024edc153" - integrity sha512-hY16Lj5IdxY213L9Sl6SlEgpCvf8/ny3SQ4S9dyG8MHqRx0fPpui5CRodhQK5lA2oScxP8qi4wfK4fIDr5xF3g== +gulp-debian@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/gulp-debian/-/gulp-debian-0.3.2.tgz#0b5a32366ae0a159529b9b7285e31bb73998da9d" + integrity sha512-P9zqKFQ9xRG1wvcJUYiBxUEypoPcDsFJxmxyJ6PSyfF2iOcsIk1mPTp47Qs0Q36bdWvrauvGTvJxscFIhK1U3A== dependencies: + find "^0.2.8" fs-extra "^5.0.0" gulp-util "^3.0.8" through2 "^2.0.1" @@ -2651,6 +2688,11 @@ interpret@^1.1.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== +interpret@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" @@ -3506,7 +3548,14 @@ lru_map@^0.3.3: resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= -macos-alias@^0.2.11, macos-alias@~0.2.5: +macos-alias@0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.5.tgz#6aca96da6404ef8d11163f60475c3fec7cfba8df" + integrity sha512-0RTWPA4hU34gErVRzK8vJzIHILj2DaPvDh9PX5wLLoat9Fot0cFdQOR5Dbnfc1RTXCDob9HY3xzXcD10t1wqDQ== + dependencies: + nan "^1.4.1" + +macos-alias@~0.2.5: version "0.2.11" resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.11.tgz#feeea6c13ba119814a43fc43c470b31e59ef718a" integrity sha1-/u6mwTuhGYFKQ/xDxHCzHlnvcYo= @@ -3773,6 +3822,11 @@ mute-stdout@^1.0.0: resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg== +nan@^1.4.1: + version "1.9.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-1.9.0.tgz#1a9cd2755609766f5c291e4194fce39fde286515" + integrity sha512-piQCQCuCG3N+cx9/izRvyYZsr7EbTgOxEJACZ5Ag1jhPHT2cCiMKiOARYkRTkkCJOgD6HAhVxuR/m4hp/F54pQ== + nan@^2.12.1, nan@^2.4.0: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" @@ -5411,6 +5465,11 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" +traverse-chain@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1" + integrity sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg== + tslib@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" @@ -5640,6 +5699,13 @@ v8flags@^3.0.1: dependencies: homedir-polyfill "^1.0.1" +v8flags@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" + integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== + dependencies: + homedir-polyfill "^1.0.1" + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" From c6584342a851d44800e827a5e84dc3a7cb3f8348 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:56:33 -0600 Subject: [PATCH 18/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- .github/workflows/build.yml | 10 ++++- package.json | 6 +-- yarn.lock | 78 ++----------------------------------- 3 files changed, 13 insertions(+), 81 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69c2fbe9b..96b24380a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,9 +66,15 @@ jobs: echo "ShortSha: ${{ steps.ids.outputs.shortsha }}" continue-on-error: true + - name: osx purge node_modules64 + if: ${{ startsWith(matrix.os, 'macos') }} + run: | + rm -rf node_modules + # build stuff - name: yarn install - run: yarn install --immutable --check-cache + run: | + yarn install --immutable --check-cache - name: yarn gulp clean-release run: yarn gulp clean-release @@ -83,7 +89,7 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | - yarn add macos-alias appdmg gulp-appdmg + yarn add fsevents macos-alias appdmg gulp-cli yarn gulp release --osx64 continue-on-error: false diff --git a/package.json b/package.json index 7fd3580fa..4868dd4b7 100644 --- a/package.json +++ b/package.json @@ -90,12 +90,8 @@ "targz": "^1.0.1", "temp": "^0.9.4", "vinyl-source-stream": "^2.0.0", - "yarn": "^1.22.15" + "yarn": "^1.22.21" }, "optionalDependencies": { - "fsevents": "^2.3.3", - "appdmg": "^0.6.4", - "macos-alias": "0.2.5", - "gulp-cli": "^2.3.0" } } diff --git a/yarn.lock b/yarn.lock index 999385e95..e29c6e15e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -251,23 +251,6 @@ appdmg@^0.6.0: path-exists "^4.0.0" repeat-string "^1.5.4" -appdmg@^0.6.4: - version "0.6.6" - resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.6.6.tgz#d06bd82b530032fd7a8f0970a1c6ee6196e1efce" - integrity sha512-GRmFKlCG+PWbcYF4LUNonTYmy0GjguDy6Jh9WP8mpd0T6j80XIJyXBiWlD0U+MLNhqV9Nhx49Gl9GpVToulpLg== - dependencies: - async "^1.4.2" - ds-store "^0.1.5" - execa "^1.0.0" - fs-temp "^1.0.0" - fs-xattr "^0.3.0" - image-size "^0.7.4" - is-my-json-valid "^2.20.0" - minimist "^1.1.3" - parse-color "^1.0.0" - path-exists "^4.0.0" - repeat-string "^1.5.4" - append-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" @@ -2046,11 +2029,6 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - fsevents@~2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" @@ -2335,30 +2313,6 @@ gulp-cli@^2.2.0: v8flags "^3.0.1" yargs "^7.1.0" -gulp-cli@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f" - integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A== - dependencies: - ansi-colors "^1.0.1" - archy "^1.0.0" - array-sort "^1.0.0" - color-support "^1.1.3" - concat-stream "^1.6.0" - copy-props "^2.0.1" - fancy-log "^1.3.2" - gulplog "^1.0.0" - interpret "^1.4.0" - isobject "^3.0.1" - liftoff "^3.1.0" - matchdep "^2.0.0" - mute-stdout "^1.0.0" - pretty-hrtime "^1.0.0" - replace-homedir "^1.0.0" - semver-greatest-satisfied-range "^1.1.0" - v8flags "^3.2.0" - yargs "^7.1.0" - gulp-concat@~2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353" @@ -2688,11 +2642,6 @@ interpret@^1.1.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -interpret@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" - integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== - invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" @@ -3548,13 +3497,6 @@ lru_map@^0.3.3: resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= -macos-alias@0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.5.tgz#6aca96da6404ef8d11163f60475c3fec7cfba8df" - integrity sha512-0RTWPA4hU34gErVRzK8vJzIHILj2DaPvDh9PX5wLLoat9Fot0cFdQOR5Dbnfc1RTXCDob9HY3xzXcD10t1wqDQ== - dependencies: - nan "^1.4.1" - macos-alias@~0.2.5: version "0.2.11" resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.11.tgz#feeea6c13ba119814a43fc43c470b31e59ef718a" @@ -3822,11 +3764,6 @@ mute-stdout@^1.0.0: resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg== -nan@^1.4.1: - version "1.9.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-1.9.0.tgz#1a9cd2755609766f5c291e4194fce39fde286515" - integrity sha512-piQCQCuCG3N+cx9/izRvyYZsr7EbTgOxEJACZ5Ag1jhPHT2cCiMKiOARYkRTkkCJOgD6HAhVxuR/m4hp/F54pQ== - nan@^2.12.1, nan@^2.4.0: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" @@ -5699,13 +5636,6 @@ v8flags@^3.0.1: dependencies: homedir-polyfill "^1.0.1" -v8flags@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" - integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== - dependencies: - homedir-polyfill "^1.0.1" - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -6056,10 +5986,10 @@ yargs@^7.1.0: y18n "^3.2.1" yargs-parser "^5.0.0" -yarn@^1.22.15: - version "1.22.15" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.15.tgz#3431d5f134d3c752a57a9dd7f5e1167627ca3cc3" - integrity sha512-AzoEDxj256BOS/jqDXA3pjyhmi4FRBBUMgYoTHI4EIt2EhREkvH0soPVEtnD+DQIJfU5R9bKhcZ1H9l8zPWeoA== +yarn@^1.22.21: + version "1.22.21" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.21.tgz#1959a18351b811cdeedbd484a8f86c3cc3bbaf72" + integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg== yauzl@2.4.1: version "2.4.1" From 6c93c55eae1a6db96625e4f8fb551ecf1a12c9b7 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:03:01 -0600 Subject: [PATCH 19/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- .github/workflows/build.yml | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96b24380a..88f79fe22 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: - name: setup node uses: actions/setup-node@v4 with: - node-version: '16' + node-version: '12' continue-on-error: false # for debugging diff --git a/package.json b/package.json index 4868dd4b7..5bf9765ed 100644 --- a/package.json +++ b/package.json @@ -93,5 +93,6 @@ "yarn": "^1.22.21" }, "optionalDependencies": { + "appdmg": "^0.6.6" } } From 26292dc73d7cc85b97dc1aa0f8a0630f5006c51e Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:03:24 -0600 Subject: [PATCH 20/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- yarn.lock | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/yarn.lock b/yarn.lock index e29c6e15e..10511965c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -251,6 +251,23 @@ appdmg@^0.6.0: path-exists "^4.0.0" repeat-string "^1.5.4" +appdmg@^0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.6.6.tgz#d06bd82b530032fd7a8f0970a1c6ee6196e1efce" + integrity sha512-GRmFKlCG+PWbcYF4LUNonTYmy0GjguDy6Jh9WP8mpd0T6j80XIJyXBiWlD0U+MLNhqV9Nhx49Gl9GpVToulpLg== + dependencies: + async "^1.4.2" + ds-store "^0.1.5" + execa "^1.0.0" + fs-temp "^1.0.0" + fs-xattr "^0.3.0" + image-size "^0.7.4" + is-my-json-valid "^2.20.0" + minimist "^1.1.3" + parse-color "^1.0.0" + path-exists "^4.0.0" + repeat-string "^1.5.4" + append-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" From 152fc4b9a55eaa3a4b7a39919000d24a47492b7a Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:13:40 -0600 Subject: [PATCH 21/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bf9765ed..4e7333eb9 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "fs-extra": "^9.1.0", "gulp": "^4.0.2", "gulp-concat": "~2.6.1", - "gulp-debian": "^0.3.2", + "gulp-debian": "~0.1.9", "gulp-git": "^2.10.1", "gulp-rename": "^2.0.0", "gulp-yarn": "^3.0.0", From cc72795fe7e25cfc821aff865f00034614194b87 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:20:51 -0600 Subject: [PATCH 22/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88f79fe22..384241d71 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,7 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | - yarn add fsevents macos-alias appdmg gulp-cli + yarn add macos-alias yarn gulp release --osx64 continue-on-error: false From 3069e54a2c7cd1b592fbef2dde6f647cc3cebd10 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:24:48 -0600 Subject: [PATCH 23/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; efffff youuuu --- .github/workflows/build.yml | 2 +- package.json | 2 +- yarn.lock | 23 +++++------------------ 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 384241d71..298849e8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false max-parallel: 3 matrix: - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-22.04, macos-12, windows-2022] outputs: buildtag: ${{ steps.ids.outputs.buildtag }} shortsha: ${{ steps.ids.outputs.shortsha }} diff --git a/package.json b/package.json index 4e7333eb9..81f38bc37 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "targz": "^1.0.1", "temp": "^0.9.4", "vinyl-source-stream": "^2.0.0", - "yarn": "^1.22.21" + "yarn": "^1.22.15" }, "optionalDependencies": { "appdmg": "^0.6.6" diff --git a/yarn.lock b/yarn.lock index 10511965c..b3c96d493 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1845,13 +1845,6 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find@^0.2.8: - version "0.2.9" - resolved "https://registry.yarnpkg.com/find/-/find-0.2.9.tgz#4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c" - integrity sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ== - dependencies: - traverse-chain "~0.1.0" - findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -2339,12 +2332,11 @@ gulp-concat@~2.6.1: through2 "^2.0.0" vinyl "^2.0.0" -gulp-debian@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/gulp-debian/-/gulp-debian-0.3.2.tgz#0b5a32366ae0a159529b9b7285e31bb73998da9d" - integrity sha512-P9zqKFQ9xRG1wvcJUYiBxUEypoPcDsFJxmxyJ6PSyfF2iOcsIk1mPTp47Qs0Q36bdWvrauvGTvJxscFIhK1U3A== +gulp-debian@~0.1.9: + version "0.1.9" + resolved "https://registry.yarnpkg.com/gulp-debian/-/gulp-debian-0.1.9.tgz#80e4a8cfc0f0904312f07e66a06ca3c024edc153" + integrity sha512-hY16Lj5IdxY213L9Sl6SlEgpCvf8/ny3SQ4S9dyG8MHqRx0fPpui5CRodhQK5lA2oScxP8qi4wfK4fIDr5xF3g== dependencies: - find "^0.2.8" fs-extra "^5.0.0" gulp-util "^3.0.8" through2 "^2.0.1" @@ -5419,11 +5411,6 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -traverse-chain@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1" - integrity sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg== - tslib@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" @@ -6003,7 +5990,7 @@ yargs@^7.1.0: y18n "^3.2.1" yargs-parser "^5.0.0" -yarn@^1.22.21: +yarn@^1.22.15: version "1.22.21" resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.21.tgz#1959a18351b811cdeedbd484a8f86c3cc3bbaf72" integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg== From 07e87cb18c65a2ac795cf3da288dd674293e8f19 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:27:23 -0600 Subject: [PATCH 24/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; okay nothing really changed, will this eff up??? --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 298849e8c..20ef2b9fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: echo "ShortSha: ${{ steps.ids.outputs.shortsha }}" continue-on-error: true - - name: osx purge node_modules64 + - name: osx purge node_modules if: ${{ startsWith(matrix.os, 'macos') }} run: | rm -rf node_modules From 4c7e6b5a80954a5dd8cdca2ef8b9972c0f0ce1c8 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:36:16 -0600 Subject: [PATCH 25/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; okay nothing really changed, will this eff up??? --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20ef2b9fa..e1187ec66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,7 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | - yarn add macos-alias + yarn add macos-alias node-gyp yarn gulp release --osx64 continue-on-error: false From 7465bd845f7e4212cffa445dcea36a3eab22f945 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:39:23 -0600 Subject: [PATCH 26/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; okay nothing really changed, will this eff up??? --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1187ec66..23fc43c9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,7 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | - yarn add macos-alias node-gyp + yarn add node-gyp yarn gulp release --osx64 continue-on-error: false From 027d5cc075828f45d3f366dfee383a3471d7892e Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:44:35 -0600 Subject: [PATCH 27/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; okay nothing really changed, will this eff up??? --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23fc43c9c..554be9085 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,6 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | - yarn add node-gyp yarn gulp release --osx64 continue-on-error: false From 36284d4565bad7c9cd3c56aacf29e12e09d3ebca Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:49:59 -0600 Subject: [PATCH 28/28] Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add macos-alias ; okay nothing really changed, will this eff up??? --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 554be9085..20ef2b9fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,6 +89,7 @@ jobs: - name: yarn gulp release --osx64 if: ${{ startsWith(matrix.os, 'macos') }} run: | + yarn add macos-alias yarn gulp release --osx64 continue-on-error: false