Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

node v12 ; OSX fix #487

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
728e720
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
6eff9d7
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
3092fef
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
c8ad2d0
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
c6dcc40
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
926c9e4
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
341dedc
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
9eaa7d2
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
d43ec4f
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
0ceafe1
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
20d2e6d
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
f0a7a05
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
ab3e298
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
bbf352e
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
f6d7644
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
cd5280c
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
25b3acd
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
c658434
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
6c93c55
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
26292dc
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
152fc4b
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
cc72795
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
3069e54
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
07e87cb
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
4c7e6b5
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
7465bd8
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
027d5cc
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
36284d4
Force/Allow Node12; Fix OSX Building via local gulp-appdmg and add ma…
nerdCopter Dec 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@ 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]
os: [ubuntu-22.04, macos-12, windows-2022]
outputs:
buildtag: ${{ steps.ids.outputs.buildtag }}
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
Expand All @@ -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
Expand All @@ -65,9 +66,15 @@ jobs:
echo "ShortSha: ${{ steps.ids.outputs.shortsha }}"
continue-on-error: true

- name: osx purge node_modules
if: ${{ startsWith(matrix.os, 'macos') }}
run: |
rm -rf node_modules

# build stuff
- name: yarn install
run: yarn install
run: |
yarn install --immutable --check-cache

- name: yarn gulp clean-release
run: yarn gulp clean-release
Expand All @@ -82,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

Expand Down
30 changes: 30 additions & 0 deletions gulp-appdmg.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
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;
};
7 changes: 3 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -668,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');
Expand All @@ -676,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);

Expand All @@ -697,14 +697,13 @@ 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 }
},
})
);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@
"yarn": "^1.22.15"
},
"optionalDependencies": {
"gulp-appdmg": "^1.0.3"
"appdmg": "^0.6.6"
}
}
Loading
Loading