force macos github actions to work (#489)

emuflight · Dec 6, 2023 · 8e9d2d6 · 8e9d2d6
1 parent c2892e2
commit 8e9d2d6
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 44 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ on:
   # repository_dispatch is a newer github-actions feature that will allow building from triggers other than code merge/PR
   repository_dispatch:
     types: [build]
+  workflow_dispatch:
 
 name: Build EmuConfigurator
 jobs:
@@ -24,7 +25,8 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        #https://github.com/actions/runner-images
+        os: [ubuntu-22.04, macos-11, windows-2022]
     outputs:
       buildtag: ${{ steps.ids.outputs.buildtag }}
       shortsha: ${{ steps.ids.outputs.shortsha }}
@@ -66,12 +68,28 @@ jobs:
           echo "ShortSha: ${{ steps.ids.outputs.shortsha }}"
         continue-on-error: true
 
+      - name: which python
+        run: |
+          echo "python version:"
+          python --version
+          which python
+
       # build stuff
       - name: yarn install
-        run: yarn install --immutable --immutable-cache --check-cache
+        run: |
+          npm config set fetch-retry-maxtimeout 600000 -g
+          yarn install --immutable --immutable-cache --check-cache
+
+      # this forces appdmg install even though package.json optionalDependencies has/needs it.
+      - name: setup macos
+        if: ${{ startsWith(matrix.os, 'macos') }}
+        run: |
+          npm install appdmg@0.6.6 --python=python2.7
+        continue-on-error: true
 
       - name: yarn gulp clean-release
         run: yarn gulp clean-release
+        continue-on-error: true
 
       - name: yarn gulp release --linux64
         if: ${{ startsWith(matrix.os, 'ubuntu') }}

diff --git a/gulp-appdmg.js b/gulp-appdmg.js
diff --git a/gulp-macdmg.js b/gulp-macdmg.js
@@ -0,0 +1,30 @@
+var appdmg = require('appdmg');
+var through = require('through2');
+var PluginError = require('plugin-error');
+var log = require('fancy-log');
+
+var PLUGIN_NAME = 'gulp-macdmg';
+
+module.exports = function(options) {
+  var stream = through.obj(function(file, encoding, next) {
+    next();
+  }, function(callback) {
+    var self = this;
+    var ee = appdmg(options);
+
+    ee.on('progress', function(info) {
+      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
@@ -678,7 +678,7 @@ function release_osx64() {
     }
 
     //var appdmg = require('gulp-appdmg');
-    const appdmg = require('./gulp-appdmg');
+    const appdmg = require('./gulp-macdmg');
 
 
     // The appdmg does not generate the folder correctly, manually

diff --git a/package.json b/package.json
@@ -90,10 +90,9 @@
     "targz": "^1.0.1",
     "temp": "^0.9.4",
     "vinyl-source-stream": "^2.0.0",
-    "yarn": "^1.22.15"
+    "yarn": "1.22"
   },
   "optionalDependencies": {
-    "appdmg": "^0.6.4",
-    "macos-alias": "^0.2.11"
+    "appdmg": "^0.6.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -251,7 +251,7 @@ appdmg@^0.6.0:
     path-exists "^4.0.0"
     repeat-string "^1.5.4"
 
-appdmg@^0.6.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==
@@ -3506,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.11, macos-alias@~0.2.5:
+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=
@@ -5990,10 +5990,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:
+  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"