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

Bump core version to 1.1.14 #30

Merged
merged 11 commits into from
May 16, 2024
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
target:
- x64
node:
- 16
- 18
name: ${{ matrix.os }} (node=${{ matrix.node }}, host=${{ matrix.host }}, target=${{ matrix.target }})
steps:
- uses: actions/checkout@v3
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,22 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-14
- ubuntu-20.04
- windows-latest
host:
- x64
target:
- x64
node:
- 16
- 18
include:
- os: windows-latest
node: 16
node: 18
host: x86
target: x86
# This is a self-hosted runner, github doesn't have this architecture yet.
- os: macos-m1
node: 16
- os: macos-14
node: 18
host: arm64
target: arm64
name: ${{ matrix.os }} (node=${{ matrix.node }}, host=${{ matrix.host }}, target=${{ matrix.target }})
Expand All @@ -54,7 +53,7 @@ jobs:
cmd /c ftype bashscript="%ProgramFiles%\Git\bin\bash.exe" "%1"
cmd /c ftype

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -66,13 +65,13 @@ jobs:
- name: check bash
run: yarn run check:bash:ci

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
architecture: ${{ matrix.host }}

- name: Add yarn (self-hosted)
if: matrix.os == 'macos-m1'
- name: Add yarn
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
run: npm install -g yarn

- name: Install dependencies
Expand All @@ -98,5 +97,6 @@ jobs:
DEBUG: electron-builder
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.CSC_LINK }}
2 changes: 1 addition & 1 deletion core
Submodule core updated 538 files
2 changes: 1 addition & 1 deletion ext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"devDependencies": {
"electron": "22.0.3",
"electron-builder": "23.6.0",
"electron-notarize": "1.2.2"
"@electron/notarize": "2.3.2"
}
}
10 changes: 7 additions & 3 deletions scripts/notarize.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env node

const { notarize } = require('electron-notarize');
const { notarize } = require('@electron/notarize');
const path = require('path');

exports.default = async function notarizing(context) {
Expand All @@ -10,11 +10,11 @@ exports.default = async function notarizing(context) {
return;
}
console.log('Notarization begins...')
const appBundleId = context.packager.appInfo.info._configuration.appId;
const appName = context.packager.appInfo.productFilename;
const appPath = path.normalize(path.join(context.appOutDir, `${appName}.app`));
const appleId = process.env.APPLE_ID;
const appleIdPassword = process.env.APPLE_ID_PASSWORD;
const teamId = process.env.APPLE_TEAM_ID;
if (!appleId) {
console.warn('Please set APPLE_ID');
process.exit(1);
Expand All @@ -23,10 +23,14 @@ exports.default = async function notarizing(context) {
console.warn('Please set APPLE_ID_PASSWORD');
process.exit(1);
}
if (!teamId) {
console.warn('Please set TEAM_ID');
process.exit(1);
}
return notarize({
appBundleId,
appPath,
appleId,
appleIdPassword,
teamId
});
};
Loading
Loading