Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure parcel/watcher darwin-arm64 is downloaded #5920

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Ensure parcel/watcher darwin-arm64 is downloaded #5920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4db570c
Ensure parcel/watcher darwin-arm64 is downloaded
ClementPasteau Nov 17, 2023
3400fc6
Add electron-app app package.json to cache dependencies
ClementPasteau Nov 17, 2023
fd3ecac
Add all parcel watcher optional packages in electron app optional dep…
AlexandreSi Nov 20, 2023
4983eec
Reduce optional dependencies to darwin arm64 only with fixed version
AlexandreSi Nov 20, 2023
5a1f5ee
Force install right watcher for arm64 macos install as a test
AlexandreSi Nov 20, 2023
6f97336
Add @parcel/watcher-darwin-arm64 in dependencies
AlexandreSi Nov 20, 2023
5d55014
Use M1 machine to build macos dmg
AlexandreSi Nov 20, 2023
1a01c49
Remove CI step
AlexandreSi Nov 21, 2023
17ba378
Temporarily try to install parcel-watcher for arm64 on a macintel
4ian Nov 21, 2023
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
13 changes: 8 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
build-macos:
macos:
xcode: 14.2.0
# resource_class: macos.m1.medium.gen1
steps:
- checkout

Expand All @@ -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---

Expand All @@ -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).
Expand Down Expand Up @@ -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---

Expand All @@ -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:
Expand Down
9 changes: 4 additions & 5 deletions newIDE/electron-app/app/package-lock.json
View file
Open in desktop

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