Skip to content

Commit

Permalink
Merge pull request #1741 from qdraw/feature/202410_desktop_update_2
Browse files Browse the repository at this point in the history
update packages desktop
  • Loading branch information
qdraw authored Oct 6, 2024
2 parents 1eb2e6c + 097ac7c commit 743000d
Show file tree
Hide file tree
Showing 8 changed files with 1,901 additions and 1,023 deletions.
21 changes: 16 additions & 5 deletions .github/workflows/desktop-electron-pr-build-mac-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-latest]

steps:
- uses: actions/checkout@v4

- name: Set node version
uses: actions/setup-node@v4
with:
node-version: '20.x'

- name: Fake Starsky Zip (Windows)
shell: bash
working-directory: ./starsky
Expand All @@ -34,12 +40,17 @@ jobs:
shell: bash
working-directory: ./starsky
run: cp starsky-win-x64.zip starsky-osx-x64.zip
- name: Unzip Mac OS bundle

- name: Unzip Mac OS bundle x64
shell: bash
working-directory: ./starsky
run: unzip starsky-osx-x64.zip -d osx-x64

run: unzip starsky-osx-x64.zip -d osx-x64

- name: Unzip Mac OS bundle arm64
shell: bash
working-directory: ./starsky
run: unzip starsky-osx-x64.zip -d osx-arm64

- name: Unzip Windows bundle
shell: bash
working-directory: ./starsky
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation-linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

strategy:
matrix:
node-version: [18.x, 20.x]
node-version: [18.x, 20.x, 22.x]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion starsky/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ git clone "https://github.com/qdraw/starsky.git"
```

2. Get the `dotnet` 8.0.302 SDK. To get the 'Build apps - SDK' .NET Core from https://www.microsoft.com/net/download or https://versionsof.net/
3. Get a recent version of nodejs (18.x or newer)
3. Get a recent version of nodejs (20.x or newer)

4. Make a build of all the projects and run the tests
from the root folder of the repository
Expand Down
1 change: 1 addition & 0 deletions starskydesktop/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v22.9.0
Loading

0 comments on commit 743000d

Please sign in to comment.