Skip to content
This repository was archived by the owner on May 2, 2022. It is now read-only.

Commit 451b260

Browse files
authored
Add Windows on ARM support (#1459)
1 parent e26cec5 commit 451b260

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Windows (x64)
1+
name: Windows
22

33
on:
44
push:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# WebCatalog [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](LICENSE)
22

3-
|macOS|
3+
|macOS (x64 + arm64)|
44
|---|
55
|[![macOS](https://github.com/webcatalog/webcatalog-app/workflows/macOS/badge.svg)](https://github.com/webcatalog/webcatalog-app/actions?query=workflow:%22macOS%22)|
66

77
|Linux (x64)|Linux (arm64)|
88
|---|---|
99
|[![Linux (x64)](https://github.com/webcatalog/webcatalog-app/workflows/Linux%20(x64)/badge.svg)](https://github.com/webcatalog/webcatalog-app/actions?query=workflow%3A%22Linux+%28x64%29%22)|[![Linux (arm64)](https://github.com/webcatalog/webcatalog-app/workflows/Linux%20(arm64)/badge.svg)](https://github.com/webcatalog/webcatalog-app/actions?query=workflow%3A%22Linux+%28arm64%29%22)|
1010

11-
|Windows (x64)|
11+
|Windows (x64 + arm64)|
1212
|---|
13-
|[![Windows (x64)](https://github.com/webcatalog/webcatalog-app/workflows/Windows%20(x64)/badge.svg)](https://github.com/webcatalog/webcatalog-app/actions?query=workflow%3A%22Windows+%28x64%29%22)|
13+
|[![Windows](https://github.com/webcatalog/webcatalog-app/workflows/Windows/badge.svg)](https://github.com/webcatalog/webcatalog-app/actions?query=workflow:%22Windows%22)|
1414

1515
**[WebCatalog](https://webcatalog.app)** - Turn Websites into Desktop Apps.
1616

dist.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if ((['x64', 'arm64'].indexOf(arch) < 0)) {
7676
console.log(`${process.platform} ${arch} is not supported.`);
7777
}
7878

79-
console.log(`Building for: ${process.platform} ${process.platform === 'darwin' ? 'x64+arm64' : arch}`);
79+
console.log(`Building for: ${process.platform} ${process.platform !== 'linux' ? 'x64 + arm64' : arch}`);
8080

8181
let targets;
8282
switch (process.platform) {
@@ -85,7 +85,7 @@ switch (process.platform) {
8585
break;
8686
}
8787
case 'win32': {
88-
targets = Platform.WINDOWS.createTarget(['nsis'], Arch[arch]);
88+
targets = Platform.WINDOWS.createTarget(['nsis'], Arch.arm64, Arch.x64);
8989
break;
9090
}
9191
default:
@@ -146,10 +146,6 @@ const opts = {
146146
category: 'Utility',
147147
packageCategory: 'utils',
148148
},
149-
nsis: arch === 'arm64' ? {
150-
// eslint-disable-next-line no-template-curly-in-string
151-
artifactName: 'WebCatalog-Setup-${version}-arm64.${ext}',
152-
} : undefined,
153149
afterSign: (context) => {
154150
// Only notarize app when forced in pull requests or when releasing using tag
155151
const shouldNotarize = process.platform === 'darwin' && context.electronPlatformName === 'darwin' && process.env.CI_BUILD_TAG;

0 commit comments

Comments
 (0)