Skip to content

Commit d25d03c

Browse files
committed
Merge branch 'main' into fine_william___fine
2 parents f395ca9 + 2b6ff08 commit d25d03c

Some content is hidden

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

62 files changed

+1405
-1250
lines changed

.github/workflows/build-linux-installer-deb.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ jobs:
9292
env:
9393
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9494

95+
- name: Setup Node per .nvmrc in GUI
96+
uses: actions/setup-node@v5
97+
with:
98+
node-version-file: chia-blockchain-gui/.nvmrc
99+
95100
- name: Get latest madmax plotter
96101
env:
97102
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-linux-installer-rpm.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ jobs:
8282
env:
8383
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8484

85+
- name: Setup Node per .nvmrc in GUI
86+
uses: actions/setup-node@v5
87+
with:
88+
node-version-file: chia-blockchain-gui/.nvmrc
89+
8590
- name: Get latest madmax plotter
8691
env:
8792
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-macos-installers.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ jobs:
176176

177177
- uses: chia-network/actions/activate-venv@main
178178

179-
- name: Setup Node 20.x
180-
uses: actions/setup-node@v4
179+
- name: Setup Node per .nvmrc in GUI
180+
uses: actions/setup-node@v5
181181
with:
182-
node-version: "20.x"
182+
node-version-file: chia-blockchain-gui/.nvmrc
183183

184184
- name: Prepare GUI cache
185185
id: gui-ref

.github/workflows/build-windows-installer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ jobs:
9595
with:
9696
python-version: ${{ matrix.python-version }}
9797

98-
- name: Setup Node 20.x
99-
uses: actions/setup-node@v4
98+
- name: Setup Node per .nvmrc in GUI
99+
uses: actions/setup-node@v5
100100
with:
101-
node-version: "20.x"
101+
node-version-file: chia-blockchain-gui/.nvmrc
102102

103103
- name: Test for secrets access
104104
id: check_secrets

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
matrix: macos
3131
runs-on:
3232
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
33-
arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
33+
arm: macos-latest
3434
- name: Windows
3535
matrix: windows
3636
runs-on:

.github/workflows/test-install-scripts.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ concurrency:
2020
group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow_ref, github.event.pull_request.number) || github.run_id }}
2121
cancel-in-progress: true
2222

23+
defaults:
24+
run:
25+
shell: bash
26+
2327
jobs:
2428
test_scripts:
2529
name: Native ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.development.name }} - ${{ matrix.editable.name }}
@@ -77,12 +81,25 @@ jobs:
7781
uses: actions/checkout@v5
7882
with:
7983
fetch-depth: 0
84+
submodules: recursive
8085

8186
- name: Setup Python environment
8287
uses: Chia-Network/actions/setup-python@main
8388
with:
8489
python-version: ${{ matrix.python.major-dot-minor }}
8590

91+
- name: Setup Node per .nvmrc in GUI
92+
uses: actions/setup-node@v5
93+
with:
94+
node-version-file: chia-blockchain-gui/.nvmrc
95+
96+
- name: Remove GUI submodule for gui script testing
97+
env:
98+
GUI_DIRECTORY: chia-blockchain-gui
99+
run: |
100+
[ -d "${GUI_DIRECTORY}" ]
101+
rm -rf "${GUI_DIRECTORY}"
102+
86103
- uses: ./.github/actions/install
87104
with:
88105
python-version: ${{ matrix.python.major-dot-minor }}
@@ -103,6 +120,7 @@ jobs:
103120
104121
- name: Run install-gui script (Windows)
105122
if: matrix.os.matrix == 'windows'
123+
shell: pwsh
106124
run: |
107125
./Install-gui.ps1
108126

build_scripts/npm_global/__init__.py

Whitespace-only changes.

build_scripts/npm_global/package-lock.json

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

build_scripts/npm_global/package.json

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

chia-blockchain-gui

Submodule chia-blockchain-gui updated 141 files

0 commit comments

Comments
 (0)