Skip to content

Commit 65b2671

Browse files
committed
Merge branch 'main' into fine_william___fine
2 parents fd39d60 + f6d4b76 commit 65b2671

File tree

143 files changed

+2527
-3123
lines changed

Some content is hidden

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

143 files changed

+2527
-3123
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ jobs:
296296
- uses: Chia-Network/actions/clean-workspace@main
297297

298298
- name: Download packages
299-
uses: actions/download-artifact@v4
299+
uses: actions/download-artifact@v5
300300
id: download
301301
with:
302302
name: chia-installers-linux-deb-${{ matrix.arch.artifact-name }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ jobs:
307307
- uses: Chia-Network/actions/clean-workspace@main
308308

309309
- name: Download packages
310-
uses: actions/download-artifact@v4
310+
uses: actions/download-artifact@v5
311311
id: download
312312
with:
313313
name: chia-installers-linux-rpm-intel

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ jobs:
322322
- uses: Chia-Network/actions/clean-workspace@main
323323

324324
- name: Download packages
325-
uses: actions/download-artifact@v4
325+
uses: actions/download-artifact@v5
326326
id: download
327327
with:
328328
name: chia-installers-macos-dmg-${{ matrix.arch.artifact-name }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ jobs:
336336
- uses: Chia-Network/actions/clean-workspace@main
337337

338338
- name: Download packages
339-
uses: actions/download-artifact@v4
339+
uses: actions/download-artifact@v5
340340
with:
341341
name: chia-installers-windows-exe-intel
342342
path: packages

.github/workflows/reflow-publish-installer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
directories: ${{ steps.create-venv.outputs.activate-venv-directories }}
6161

6262
- name: Download constraints file
63-
uses: actions/download-artifact@v4
63+
uses: actions/download-artifact@v5
6464
with:
6565
name: constraints-file-${{ matrix.arch.artifact-name }}
6666
path: venv
@@ -70,7 +70,7 @@ jobs:
7070
pip install --constraint venv/constraints.txt py3createtorrent
7171
7272
- name: Download packages
73-
uses: actions/download-artifact@v4
73+
uses: actions/download-artifact@v5
7474
with:
7575
name: chia-installers-${{ matrix.os.artifact-platform-name }}-${{ matrix.os.file-type.extension }}-${{ matrix.arch.artifact-name }}
7676
path: artifacts/
@@ -97,7 +97,7 @@ jobs:
9797

9898
- name: Configure AWS credentials
9999
if: steps.check_secrets.outputs.HAS_AWS_SECRET
100-
uses: aws-actions/configure-aws-credentials@v4
100+
uses: aws-actions/configure-aws-credentials@v5
101101
with:
102102
role-to-assume: arn:aws:iam::${{ secrets.CHIA_AWS_ACCOUNT_ID }}:role/installer-upload
103103
aws-region: us-west-2

.github/workflows/stale-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
if: github.repository_owner == 'Chia-Network'
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/stale@v9
11+
- uses: actions/stale@v10
1212
with:
1313
operations-per-run: 10000
1414
ascending: true

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@ jobs:
214214
- name: Prepare Amazon Linux
215215
if: ${{ matrix.distribution.type == 'amazon' }}
216216
run: |
217-
yum install --assumeyes git sudo
217+
yum install --assumeyes git
218218
219219
- name: Prepare Arch
220220
if: ${{ matrix.distribution.type == 'arch' }}
221221
run: |
222222
pacman --noconfirm -Syu
223-
pacman --noconfirm -S base git sudo openssl-1.1
223+
pacman --noconfirm -S base git openssl-1.1
224224
# The behavior we follow in install.sh is unique with Arch in that
225225
# we leave it to the user to install the appropriate version of python,
226226
# so we need to install python here in order for the test to succeed.
@@ -232,7 +232,7 @@ jobs:
232232
DEBIAN_FRONTEND: noninteractive
233233
run: |
234234
apt-get --yes update
235-
apt-get install --yes git lsb-release sudo python3-venv
235+
apt-get install --yes git lsb-release python3-venv
236236
237237
- name: Prepare Fedora
238238
if: ${{ matrix.distribution.type == 'fedora' }}
@@ -242,15 +242,15 @@ jobs:
242242
- name: Prepare Rocky
243243
if: ${{ matrix.distribution.type == 'rocky' }}
244244
run: |
245-
yum install --assumeyes git sudo python39
245+
yum install --assumeyes git python39
246246
247247
- name: Prepare Ubuntu
248248
if: ${{ matrix.distribution.type == 'ubuntu' }}
249249
env:
250250
DEBIAN_FRONTEND: noninteractive
251251
run: |
252252
apt-get --yes update
253-
apt-get install --yes git lsb-release sudo
253+
apt-get install --yes git lsb-release
254254
MINIMUM=3.9
255255
if ! apt-get satisfy --yes "python3-venv (>= ${MINIMUM})"
256256
then

.github/workflows/test-single.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ jobs:
127127
matrix: windows
128128
configuration:
129129
name: core.full_node
130+
# TODO: skipping macos-15-intel timelord cases until fixed
131+
# https://github.com/Chia-Network/chiavdf/pull/268
132+
- os:
133+
matrix: macos-intel
134+
configuration:
135+
install_timelord: true
130136
- python:
131137
exclude_from:
132138
${{ inputs.matrix_mode }}: True

.github/workflows/test.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ on:
5252
type: boolean
5353
run-macos-intel:
5454
description: "run macOS-intel tests"
55-
default: false
55+
default: true
5656
required: false
5757
type: boolean
5858
run-macos-arm:
@@ -109,24 +109,12 @@ jobs:
109109
|| 'main'
110110
}} >> "$GITHUB_OUTPUT"
111111
112-
- name: Generate mac intel configuration
113-
id: macintel
114-
run: |
115-
echo mac_intel=${{
116-
( github.event_name == 'schedule' || inputs.run-macos-intel )
117-
|| ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.ref, 'refs/heads/release/') )
118-
|| ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.base_ref, 'release/') )
119-
&& 'true'
120-
|| 'false'
121-
}} >> "$GITHUB_OUTPUT"
122-
123112
outputs:
124113
configuration: ${{ steps.configure.outputs.configuration }}
125114
matrix_mode: ${{ steps.configure.outputs.matrix_mode }}
126-
mac_intel: ${{ steps.macintel.outputs.mac_intel }}
127115

128116
macos-intel:
129-
if: needs.configure.outputs.mac_intel == 'true'
117+
if: github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
130118
uses: ./.github/workflows/test-single.yml
131119
needs: configure
132120
with:
@@ -137,7 +125,7 @@ jobs:
137125
concurrency-name: macos-intel
138126
configuration: ${{ needs.configure.outputs.configuration }}
139127
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
140-
runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
128+
runs-on: macos-15-intel
141129
arch: intel
142130
arch-emoji: 🌀
143131
macos-arm:
@@ -235,7 +223,6 @@ jobs:
235223
- uses: re-actors/alls-green@release/v1.2
236224
id: alls-green
237225
with:
238-
allowed-skips: ${{ needs.configure.outputs.mac_intel != 'true' && 'macos-intel' || '' }}
239226
jobs: ${{ toJSON(needs) }}
240227

241228
- uses: actions/checkout@v5
@@ -249,7 +236,7 @@ jobs:
249236

250237
- name: Download Results
251238
if: false
252-
uses: actions/download-artifact@v4
239+
uses: actions/download-artifact@v5
253240
with:
254241
merge-multiple: true
255242
pattern: junit-data-*
@@ -275,7 +262,7 @@ jobs:
275262
if-no-files-found: error
276263

277264
- name: Download Coverage
278-
uses: actions/download-artifact@v4
265+
uses: actions/download-artifact@v5
279266
with:
280267
merge-multiple: true
281268
pattern: coverage-data-*

CHANGELOG.md

Lines changed: 15 additions & 0 deletions

0 commit comments

Comments
 (0)