Skip to content

Commit

Permalink
Merge commit '57f284a35666796ddfaa0c600f717dca048b2efc' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjgraph committed Aug 28, 2024
2 parents ce539a9 + 57f284a commit c95b804
Show file tree
Hide file tree
Showing 6 changed files with 552 additions and 699 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/electron-builder-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: |
npm install -g yarn
yarn install
- name: Build for Windows (x32)
- name: Build for Windows (x32 & arm64)
env:
CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
Expand All @@ -61,6 +61,7 @@ jobs:
#Disable auto-update and build 32bit first such that latest.yml is for 64bit only (64bit will overwrite 32bit one)
yarn run sync disableUpdate
yarn run release-win32
yarn run release-win-arm64
- name: Build for Windows (x64)
env:
CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
stale-issue-label: 'wonfix'
stale-pr-label: 'wonfix'
close-issue-label: 'declined'
days-before-stale: 300
days-before-close: 60
days-before-stale: 250
days-before-close: 14
exempt-issue-labels: notstale
exempt-pr-labels: notstale
2 changes: 1 addition & 1 deletion drawio
Submodule drawio updated 106 files
61 changes: 61 additions & 0 deletions electron-builder-win-arm64.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"appId": "com.jgraph.drawio.desktop",
"copyright": "Copyright 2017-2019 draw.io",
"asar": true,
"files": [
"**/*",
"!**/WEB-INF{,/**}"
],
"directories": {
"output": "./dist/"
},
"npmRebuild": false,
"publish": {
"provider": "github"
},
"win": {
"publisherName": "JGraph Ltd",
"target": [
{
"target": "nsis",
"arch": [
"arm64"
]
},
{
"target": "portable",
"arch": [
"arm64"
]
}
]
},
"nsis": {
"artifactName": "${productName}-arm64-${version}-windows-arm64-installer.${ext}",
"oneClick": false,
"perMachine": true,
"allowToChangeInstallationDirectory": true,
"runAfterFinish": false,
"createDesktopShortcut": false
},
"portable": {
"artifactName": "${productName}-arm64-${version}-windows-arm64-no-installer.${ext}"
},
"afterPack": "build/fuses.cjs",
"fileAssociations": [
{
"ext": "drawio",
"name": "draw.io Diagram",
"description": "draw.io Diagram",
"mimeType": "application/vnd.jgraph.mxfile",
"role": "Editor"
},
{
"ext": "vsdx",
"name": "VSDX Document",
"description": "VSDX Document",
"mimeType": "application/vnd.visio",
"role": "Editor"
}
]
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"sync": "node ./sync.cjs",
"release-win": "electron-builder --config electron-builder-win.json --publish always",
"release-win32": "electron-builder --config electron-builder-win32.json --publish always",
"release-win-arm64": "electron-builder --config electron-builder-win-arm64.json --publish always",
"release-appx": "electron-builder --config electron-builder-appx.json --publish always",
"release-linux": "electron-builder --config electron-builder-linux-mac.json --publish always",
"release-snap": "electron-builder --config electron-builder-snap.json --publish never"
Expand Down
Loading

0 comments on commit c95b804

Please sign in to comment.