Skip to content

Commit 0d7a723

Browse files
authored
catchup: into long_lived/datalayer_merkle_blob from main @ ebf8105 (#20041)
Source hash: ebf8105 Remaining commits: 0
2 parents 6b5ee60 + 7e98baa commit 0d7a723

File tree

233 files changed

+6494
-3431
lines changed

Some content is hidden

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

233 files changed

+6494
-3431
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ updates:
2525
schedule:
2626
interval: "weekly"
2727
day: "tuesday"
28-
open-pull-requests-limit: 10
28+
open-pull-requests-limit: 30
2929
rebase-strategy: auto
3030
labels:
3131
- dependencies

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
build:
4949
name: Benchmarks
50-
runs-on: benchmark
50+
runs-on: ${{ github.repository_owner == 'Chia-Network' && 'benchmark' || 'ubuntu-latest' }}
5151
needs:
5252
- setup
5353
container:
@@ -69,7 +69,7 @@ jobs:
6969
uses: Chia-Network/actions/git-mark-workspace-safe@main
7070

7171
- name: Checkout Code
72-
uses: actions/checkout@v4
72+
uses: actions/checkout@v5
7373
with:
7474
fetch-depth: 0
7575

@@ -78,7 +78,7 @@ jobs:
7878
mode: poetry
7979

8080
- name: Checkout test blocks and plots
81-
uses: actions/checkout@v4
81+
uses: actions/checkout@v5
8282
with:
8383
repository: "Chia-Network/test-cache"
8484
path: ".chia"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
madmax-suffix: "x86-64"
6060
bladebit-suffix: "ubuntu-x86-64.tar.gz"
6161
arch-artifact-name: intel
62-
- runs-on: [Linux, ARM64]
62+
- runs-on: ubuntu-24.04-arm
6363
arch: arm64
6464
madmax-suffix: "arm64"
6565
bladebit-suffix: "ubuntu-arm64.tar.gz"
@@ -77,7 +77,7 @@ jobs:
7777
uses: Chia-Network/actions/git-mark-workspace-safe@main
7878

7979
- name: Checkout Code
80-
uses: actions/checkout@v4
80+
uses: actions/checkout@v5
8181
with:
8282
fetch-depth: 0
8383
submodules: recursive
@@ -254,7 +254,7 @@ jobs:
254254
matrix:
255255
os:
256256
- runs-on:
257-
arm: [linux, arm64]
257+
arm: [ubuntu-24.04-arm]
258258
intel: [ubuntu-latest]
259259
distribution:
260260
- name: debian:bookworm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
uses: Chia-Network/actions/git-mark-workspace-safe@main
6868

6969
- name: Checkout Code
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@v5
7171
with:
7272
fetch-depth: 0
7373
submodules: recursive

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ jobs:
5353
matrix:
5454
python-version: ["3.10"]
5555
os:
56-
- runs-on: macos-13
56+
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
5757
name: intel
5858
bladebit-suffix: macos-x86-64.tar.gz
5959
arch-artifact-name: intel
60-
- runs-on: macos-13-arm64
60+
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
6161
name: m1
6262
bladebit-suffix: macos-arm64.tar.gz
6363
arch-artifact-name: arm
@@ -71,7 +71,7 @@ jobs:
7171
- uses: Chia-Network/actions/clean-workspace@main
7272

7373
- name: Checkout Code
74-
uses: actions/checkout@v4
74+
uses: actions/checkout@v5
7575
with:
7676
fetch-depth: 0
7777
submodules: recursive
@@ -296,7 +296,7 @@ jobs:
296296
- name: 13
297297
matrix: 13
298298
runs-on:
299-
intel: macos-13
299+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
300300
- name: 14
301301
matrix: 14
302302
runs-on:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
steps:
6262
- name: Checkout Code
63-
uses: actions/checkout@v4
63+
uses: actions/checkout@v5
6464
with:
6565
fetch-depth: 0
6666
submodules: recursive

.github/workflows/check-commit-signing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout Code
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626
with:
2727
fetch-depth: 0
2828

.github/workflows/check_wheel_availability.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
matrix: linux
3030
runs-on:
3131
intel: ubuntu-latest
32-
arm: [linux, arm64]
32+
arm: ubuntu-24.04-arm
3333
- name: macOS
3434
matrix: macos
3535
runs-on:
36-
intel: macos-13
37-
arm: macos-13-arm64
36+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
37+
arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
3838
- name: Windows
3939
matrix: windows
4040
runs-on:
@@ -55,7 +55,7 @@ jobs:
5555
- uses: Chia-Network/actions/clean-workspace@main
5656

5757
- name: Checkout Code
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v5
5959

6060
- uses: Chia-Network/actions/setup-python@main
6161
with:

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ concurrency:
2929

3030
jobs:
3131
analyze:
32+
if: github.repository_owner == 'Chia-Network'
3233
name: Analyze
3334
runs-on: ubuntu-latest
3435

@@ -42,7 +43,7 @@ jobs:
4243

4344
steps:
4445
- name: Checkout repository
45-
uses: actions/checkout@v4
46+
uses: actions/checkout@v5
4647

4748
# Initializes the CodeQL tools for scanning.
4849
- name: Initialize CodeQL

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ permissions:
1313

1414
jobs:
1515
dependency-review:
16+
if: github.repository_owner == 'Chia-Network'
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: "Checkout Repository"
19-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2021

2122
- name: "Dependency Review"
2223
uses: actions/dependency-review-action@v4

0 commit comments

Comments
 (0)