Skip to content

Commit 4832504

Browse files
fix: Upgrade major dependencies.
BREAKING CHANGE: This provides longevity for Thorium into the future, but might have changed the way some systems work. Test thoroughly before running crewed flights.
2 parents 6a00289 + 97b56e5 commit 4832504

File tree

1,412 files changed

+66477
-180868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,412 files changed

+66477
-180868
lines changed

.github/workflows/deploy.yml

Lines changed: 40 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,24 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out Git repository
14-
uses: actions/checkout@v2
15-
- name: Install Node.js, NPM and Yarn
16-
uses: actions/setup-node@v1
14+
uses: actions/checkout@v4
15+
- name: Install Node.js, NPM
16+
uses: actions/setup-node@v4
1717
with:
18-
node-version: 16
19-
- name: Cache node modules
20-
uses: actions/cache@v1
21-
env:
22-
cache-name: cache-node-modules
23-
with:
24-
path: ~/.config/yarn/global # npm cache files are stored in `~/.npm` on Linux/macOS
25-
key:
26-
${{ runner.os }}-build-${{ env.cache-name }}-${{
27-
hashFiles('**/yarn.lock') }}
28-
restore-keys: |
29-
${{ runner.os }}-build-${{ env.cache-name }}-
30-
${{ runner.os }}-build-
31-
${{ runner.os }}-
18+
node-version: 22
19+
cache: 'npm'
3220
- name: Install libs
3321
run: sudo apt-get install libudev-dev
3422
- name: Install Dependencies
35-
run: yarn
23+
run: |
24+
npm install --force
25+
npm install --force @rollup/rollup-linux-x64-gnu
3626
3727
- name: Semantic Release
3828
run: |
3929
npm run semantic-release
4030
- name: Archive production artifacts
41-
uses: actions/upload-artifact@v2
31+
uses: actions/upload-artifact@v4
4232
with:
4333
name: build
4434
path: build
@@ -48,26 +38,41 @@ jobs:
4838
needs: build
4939
strategy:
5040
matrix:
51-
os: [macos-12, windows-2019]
41+
include:
42+
- os: macos-latest
43+
arch: x64
44+
- os: macos-latest
45+
arch: arm64
46+
- os: windows-latest
47+
arch: x64
5248

5349
steps:
5450
- name: Check out Git repository
55-
uses: actions/checkout@v2
51+
uses: actions/checkout@v4
5652
with:
5753
ref: "main"
58-
- name: Install Node.js, NPM and Yarn
59-
uses: actions/setup-node@v1
54+
- name: Install Node.js, NPM
55+
uses: actions/setup-node@v4
6056
with:
61-
node-version: 16
57+
node-version: 22
58+
- name: Install Dependencies
59+
run: |
60+
npm install --force
6261
- uses: actions/setup-python@v4
6362
if: startsWith(matrix.os, 'macos')
6463
with:
6564
python-version: "3.9" # Needed for the older version of Node Gyp
6665
- name: Download production artifacts
67-
uses: actions/download-artifact@v2
66+
uses: actions/download-artifact@v4
6867
with:
6968
name: build
7069
path: build
70+
- name: Prepare for app signing
71+
if: startsWith(matrix.os, 'macos')
72+
run: ./scripts/add-osx-cert.sh
73+
env:
74+
CERTIFICATE_OSX_P12: ${{ secrets.mac_cert }}
75+
CERTIFICATE_PASSWORD: ${{ secrets.mac_cert_password }}
7176
- name: Prepare for app notarization
7277
if: startsWith(matrix.os, 'macos')
7378
# Import Apple API key for app notarization on macOS
@@ -76,24 +81,17 @@ jobs:
7681
echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
7782
7883
- name: Build/release Electron app
79-
uses: samuelmeuli/action-electron-builder@v1
84+
run: npm run publish -- --arch=${{ matrix.arch }}
8085
if: always()
81-
with:
82-
# GitHub token, automatically provided to the action
83-
# (No need to define this secret in the repo settings)
84-
github_token: ${{ secrets.github_token }}
85-
mac_certs: ${{ secrets.mac_cert }}
86-
mac_certs_password: ${{ secrets.mac_cert_password }}
87-
# Don't worry about
88-
skip_build: true
89-
# If the commit is tagged with a version (e.g. "1.0.0"),
90-
# release the app after building
91-
release: true
9286
env:
9387
# macOS notarization API key
94-
API_KEY_ID: ${{ secrets.api_key_id }}
95-
API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
88+
CSC_LINK: ${{ secrets.mac_cert }}
89+
CSC_KEY_PASSWORD: ${{ secrets.mac_cert_password }}
90+
APPLE_API_KEY: ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
91+
APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
92+
APPLE_API_ISSUER: ${{ secrets.api_key_issuer_id }}
9693
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
94+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9795
ENGINE_API_KEY: ${{ secrets.ENGINE_API_KEY }}
9896
ERROR_REPORTING_ORGANIZATION:
9997
${{ secrets.ERROR_REPORTING_ORGANIZATION }}
@@ -103,9 +101,6 @@ jobs:
103101
GOOGLE_SHEETS_SECRET: ${{ secrets.GOOGLE_SHEETS_SECRET }}
104102
GOOGLE_SHEETS_CLIENT_ID: ${{ secrets.GOOGLE_SHEETS_CLIENT_ID }}
105103
GH_ISSUE_TOKEN: ${{ secrets.GH_ISSUE_TOKEN }}
106-
# - name: Setup tmate session
107-
# uses: mxschmitt/action-tmate@v2
108-
# if: failure()
109-
# - name: Setup tmate session
110-
# uses: mxschmitt/action-tmate@v2
111-
# if: failure()
104+
- name: Setup tmate session
105+
uses: mxschmitt/action-tmate@v2
106+
if: failure()

.github/workflows/test.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,17 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check out Git repository
11-
uses: actions/checkout@v2
12-
- name: Install Node.js, NPM and Yarn
13-
uses: actions/setup-node@v1
11+
uses: actions/checkout@v4
12+
- name: Install Node.js, NPM
13+
uses: actions/setup-node@v4
1414
with:
15-
node-version: 16
16-
- name: Cache node modules
17-
uses: actions/cache@v1
18-
env:
19-
cache-name: cache-node-modules
20-
with:
21-
path: ~/.config/yarn/global # npm cache files are stored in `~/.npm` on Linux/macOS
22-
key:
23-
${{ runner.os }}-build-${{ env.cache-name }}-${{
24-
hashFiles('**/yarn.lock') }}
25-
restore-keys: |
26-
${{ runner.os }}-build-${{ env.cache-name }}-
27-
${{ runner.os }}-build-
28-
${{ runner.os }}-
15+
node-version: 22
2916
- name: Install libs
3017
run: sudo apt-get install libudev-dev
3118
- name: Install Dependencies
32-
run: yarn
19+
run: |
20+
npm i --force
21+
npm i --force @rollup/rollup-linux-x64-gnu
3322
- name: TypeScript Check
3423
run: |
3524
npm run typecheck

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ node_modules
77
coverage
88

99
# production
10-
build
10+
1111
zips
1212
dist
1313
packages
1414
.cache
15+
build
16+
out
1517

1618
# misc
1719
.DS_Store

.storybook/addons.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

.storybook/config.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

.storybook/webpack.config.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

.tool-versions

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
nodejs 16.20.2
2-
yarn 1.22.22
1+
nodejs 22.14.0

0 commit comments

Comments
 (0)