Compare commits

...

9 Commits

Author SHA1 Message Date
Florian Rival
17ba378913 Temporarily try to install parcel-watcher for arm64 on a macintel 2023-11-21 15:34:01 +01:00
AlexandreSi
1a01c49ce7 Remove CI step 2023-11-21 09:58:19 +01:00
AlexandreSi
5d55014f84 Use M1 machine to build macos dmg 2023-11-20 17:24:31 +01:00
AlexandreSi
6f97336eea Add @parcel/watcher-darwin-arm64 in dependencies 2023-11-20 17:07:53 +01:00
AlexandreSi
5a1f5eef48 Force install right watcher for arm64 macos install as a test 2023-11-20 16:26:16 +01:00
AlexandreSi
4983eeca6b Reduce optional dependencies to darwin arm64 only with fixed version 2023-11-20 15:01:05 +01:00
AlexandreSi
fd3ecacade Add all parcel watcher optional packages in electron app optional dependencies 2023-11-20 12:20:56 +01:00
Clément Pasteau
3400fc6813 Add electron-app app package.json to cache dependencies 2023-11-17 18:44:54 +01:00
Clément Pasteau
4db570c17b Ensure parcel/watcher darwin-arm64 is downloaded 2023-11-17 18:02:33 +01:00
2 changed files with 12 additions and 10 deletions

View File

@@ -16,6 +16,7 @@ jobs:
build-macos:
macos:
xcode: 14.2.0
# resource_class: macos.m1.medium.gen1
steps:
- checkout
@@ -35,7 +36,7 @@ jobs:
# GDevelop.js dependencies
- restore_cache:
keys:
- gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
- gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "newIDE/electron-app/app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
# fallback to using the latest cache if no exact match is found
- gd-macos-nodejs-dependencies---
@@ -51,14 +52,15 @@ jobs:
# GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
- run:
name: Install GDevelop IDE dependencies
command: cd newIDE/app && npm install && cd ../electron-app && npm install
command: cd newIDE/app && npm install && cd ../electron-app && npm install && cd app && npm install --arch=arm64 --force @parcel/watcher-darwin-arm64
- save_cache:
paths:
- newIDE/electron-app/node_modules
- newIDE/electron-app/app/node_modules
- newIDE/app/node_modules
- GDevelop.js/node_modules
key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "newIDE/electron-app/app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
# Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
# Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
@@ -116,7 +118,7 @@ jobs:
# GDevelop.js dependencies
- restore_cache:
keys:
- gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
- gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "newIDE/electron-app/app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
# fallback to using the latest cache if no exact match is found
- gd-linux-nodejs-dependencies---
@@ -137,9 +139,10 @@ jobs:
- save_cache:
paths:
- newIDE/electron-app/node_modules
- newIDE/electron-app/app/node_modules
- newIDE/app/node_modules
- GDevelop.js/node_modules
key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "newIDE/electron-app/app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
# Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
- run:

View File

@@ -1,16 +1,17 @@
{
"name": "gdevelop",
"version": "5.3.180",
"version": "5.3.181",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "gdevelop",
"version": "5.3.180",
"version": "5.3.181",
"license": "MIT",
"dependencies": {
"@electron/remote": "^2.0.8",
"@parcel/watcher": "2.3.0",
"@parcel/watcher-darwin-arm64": "^2.3.0",
"archiver": "^2.1.1",
"async": "^2.6.0",
"axios": "^0.19.1",
@@ -175,7 +176,6 @@
"cpu": [
"arm64"
],
"optional": true,
"os": [
"darwin"
],
@@ -5222,8 +5222,7 @@
"@parcel/watcher-darwin-arm64": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz",
"integrity": "sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw==",
"optional": true
"integrity": "sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw=="
},
"@parcel/watcher-darwin-x64": {
"version": "2.3.0",