Skip to content

Commit

Permalink
dsds
Browse files Browse the repository at this point in the history
  • Loading branch information
dfunckt committed Nov 7, 2023
1 parent 22b97f0 commit cb117d8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/actions/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ runs:
echo "version=${APPLICATION_VERSION}" >> $GITHUB_OUTPUT
env:
# ensure we sign the artifacts
NODE_ENV: production
# Apple notarization
XCODE_APP_LOADER_EMAIL: ${{ inputs.XCODE_APP_LOADER_EMAIL }}
XCODE_APP_LOADER_PASSWORD: ${{ fromJSON(inputs.secrets).XCODE_APP_LOADER_PASSWORD }}
Expand Down
1 change: 0 additions & 1 deletion .github/actions/test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ runs:
env:
# https://www.electronjs.org/docs/latest/api/environment-variables
ELECTRON_NO_ATTACH_CONSOLE: 'true'
ELECTRON_SKIP_NOTARIZATION: 'true'

- name: Compress custom source
if: runner.os != 'Windows'
Expand Down
4 changes: 2 additions & 2 deletions forge.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ every byte of data was written correctly and much more.`;
let osxSigningConfig: any = {};
let winSigningConfig: any = {};

if (process.env.NODE_ENV !== 'development' && process.env.ELECTRON_SKIP_NOTARIZATION !== 'true') {
if (process.env.NODE_ENV === 'production') {
osxSigningConfig.osxSign = {
optionsForFile: () => ({
entitlements: './entitlements.mac.plist',
Expand Down Expand Up @@ -139,7 +139,7 @@ const config: ForgeConfig = {
env: 'ETCHER_UTIL_BIN_PATH',
path: './out/sidecar/bin/etcher-util',
build: {
command: 'tsc --project tsconfig.sidecar.json && pkg out/sidecar/util/api.js -c pkg-sidecar.json --target node18 --output out/sidecar/bin/etcher-util',
command: 'npm run build-sidecar',
sources: './lib/util/',
},
verbose: true,
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"url": "[email protected]:balena-io/etcher.git"
},
"scripts": {
"tsc": "tsc",
"pkg": "pkg",
"build-sidecar": "npm rebuild mountutils && npm run tsc -- --project tsconfig.sidecar.json && npm run pkg -- ./out/sidecar/util/api.js -c pkg-sidecar.json --target node18 --output ./out/sidecar/bin/etcher-util",
"lint-css": "prettier --write lib/**/*.css",
"lint-ts": "balena-lint --fix --typescript typings lib tests webpack.config.ts",
"lint": "npm run lint-ts && npm run lint-css",
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.sidecar.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"moduleResolution": "Node",
"resolveJsonModule": true,
"isolatedModules": true,
"outDir": "out/sidecar"
"outDir": "./out/sidecar"
},
"include": ["lib/util"]
"include": ["./lib/util"]
}

0 comments on commit cb117d8

Please sign in to comment.