Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 39 additions & 17 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,29 @@ jobs:
with:
name: ${{ env.ARTIFACT_X64 }}
path: artifacts/x64/
# x32

# arm64
- name: Set arm64 MAX artifact name
run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV
shell: bash

- name: Set arm64 LITE artifact name
if: ${{ env.TRIM == '1' }}
run: echo "ARTIFACT_ARM64=$(echo "${{ env.APP_NAME }}-win-arm64-${{ env.APP_VERSION }}-LITE-${{ env.HASH }}.exe")" >> $GITHUB_ENV
shell: bash

- name: bundle arm64 windows
run: |
echo "Generating executable artifacts/arm64/${{ env.ARTIFACT_ARM64 }}"
./node_modules/.bin/gulp release-win32 --out=artifacts/arm64/${{ env.ARTIFACT_ARM64 }}

- uses: actions/upload-artifact@v4
name: Upload arm64 artifacts
with:
name: ${{ env.ARTIFACT_ARM64 }}
path: artifacts/arm64/

# x32
- name: Set x32 MAX artifact name
run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV
shell: bash
Expand Down Expand Up @@ -471,22 +493,22 @@ jobs:
echo "Building $APP_VERSION-$HASH"
npm run build-macos

# x64
- name: Set x64 MAX artifact name
run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV

- name: Set x64 LITE artifact name
if: ${{ env.TRIM == '1' }}
run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV

- name: bundle x64 macOS
run: ./node_modules/.bin/gulp release-macos --out=artifacts/x64/$ARTIFACT_X64

- uses: actions/upload-artifact@v4
name: Upload x64 artifacts
with:
name: ${{ env.ARTIFACT_X64 }}
path: artifacts/x64/
# # x64
# - name: Set x64 MAX artifact name
# run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV
#
# - name: Set x64 LITE artifact name
# if: ${{ env.TRIM == '1' }}
# run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV
#
# - name: bundle x64 macOS
# run: ./node_modules/.bin/gulp release-macos --out=artifacts/x64/$ARTIFACT_X64
#
# - uses: actions/upload-artifact@v4
# name: Upload x64 artifacts
# with:
# name: ${{ env.ARTIFACT_X64 }}
# path: artifacts/x64/

# universal build
- name: Set universal MAX artifact name
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,5 @@ You can view progress or help translate at [Crowdin](https://crowdin.com/project
- or do `build-win` or `build-linux`
- then to create installer for MacOS: `./node_modules/.bin/gulp release-macos-universal --out=artifacts/universal/tCore-macos-universal.dmg`

Note: updating to Electronite v37.1.0

2 changes: 2 additions & 0 deletions electronite/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ function createMainWindow(qaMode = '') {
contextIsolation: false,
enableRemoteModule: true,
additionalArguments,
sandbox: false,
},
};

Expand Down Expand Up @@ -160,6 +161,7 @@ function createSplashWindow() {
contextIsolation: true,
enableRemoteModule: true,
preload: path.join(__dirname, 'preloadSplash.js'),
sandbox: false,
},
frame: false,
show: true,
Expand Down
44 changes: 22 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"electronite-start": "electronite . ",
"electronite-start-logging": "electronite . --enable-logging",
"electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns",
"electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal,x64 --icon=src/images/icon.icns",
"electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal --icon=src/images/icon.icns",
"electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns",
"electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico",
"electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64,arm64 --icon=src/images/icon.ico",
"react-start": "craco start",
"react-build": "craco build",
"build-main": "webpack --config electronite/webpack.config.js",
Expand Down Expand Up @@ -88,7 +88,7 @@
"cross-env": "7.0.2",
"css-loader": "3.4.2",
"electron-devtools-installer": "^3.2.0",
"electronite": "25.3.2-graphite",
"electronite": "37.1.0-graphite",
"electronite-packager": "17.1.1-graphite",
"enzyme": "3.8.0",
"enzyme-adapter-react-16": "1.8.0",
Expand Down Expand Up @@ -123,7 +123,7 @@
},
"dependencies": {
"@craco/craco": "5.6.4",
"@electron/remote": "2.0.7",
"@electron/remote": "2.1.2",
"@material-ui/core": "4.12.3",
"@material-ui/icons": "4.11.2",
"@neutrinog/electron-dl": "1.11.1",
Expand Down
1 change: 1 addition & 0 deletions src/js/helpers/PrintPreviewHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ function createPreviewWindow(html) {
width: 850,
height: 900,
webPreferences: {
sandbox: false,
webSecurity: false, // have to do this to load local files
},
});
Expand Down
Loading