Skip to content

Commit 3238a7e

Browse files
authored
more families for the CI (#20663)
@Omega359 has [noticed](https://discord.com/channels/885562378132000778/1166447479609376850/1478152691027935312) that some CI is failing - my guess is that the family we requested wasn't available - extending the pool, hopefully this will resolve the problem
1 parent 476c200 commit 3238a7e

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/workflows/extended.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
# Check crate compiles and base cargo check passes
6767
linux-build-lib:
6868
name: linux build test
69-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
69+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
7070
# note: do not use amd/rust container to preserve disk space
7171
steps:
7272
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
@@ -93,7 +93,7 @@ jobs:
9393
linux-test-extended:
9494
name: cargo test 'extended_tests' (amd64)
9595
needs: [linux-build-lib]
96-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=32,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion,spot=false', github.run_id) || 'ubuntu-latest' }}
96+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=32,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion,spot=false', github.run_id) || 'ubuntu-latest' }}
9797
# spot=false because the tests are long, https://runs-on.com/configuration/spot-instances/#disable-spot-pricing
9898
# note: do not use amd/rust container to preserve disk space
9999
steps:
@@ -140,7 +140,7 @@ jobs:
140140
# Check answers are correct when hash values collide
141141
hash-collisions:
142142
name: cargo test hash collisions (amd64)
143-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
143+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
144144
container:
145145
image: amd64/rust
146146
steps:
@@ -162,7 +162,7 @@ jobs:
162162
163163
sqllogictest-sqlite:
164164
name: "Run sqllogictests with the sqlite test suite"
165-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=48,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion,spot=false', github.run_id) || 'ubuntu-latest' }}
165+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=48,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion,spot=false', github.run_id) || 'ubuntu-latest' }}
166166
# spot=false because the tests are long, https://runs-on.com/configuration/spot-instances/#disable-spot-pricing
167167
container:
168168
image: amd64/rust

.github/workflows/rust.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# Check crate compiles and base cargo check passes
4848
linux-build-lib:
4949
name: linux build test
50-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
50+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
5151
container:
5252
image: amd64/rust
5353
steps:
@@ -101,7 +101,7 @@ jobs:
101101
linux-datafusion-substrait-features:
102102
name: cargo check datafusion-substrait features
103103
needs: linux-build-lib
104-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
104+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
105105
container:
106106
image: amd64/rust
107107
steps:
@@ -138,7 +138,7 @@ jobs:
138138
linux-datafusion-proto-features:
139139
name: cargo check datafusion-proto features
140140
needs: linux-build-lib
141-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
141+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
142142
container:
143143
image: amd64/rust
144144
steps:
@@ -170,7 +170,7 @@ jobs:
170170
linux-cargo-check-datafusion:
171171
name: cargo check datafusion features
172172
needs: linux-build-lib
173-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
173+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
174174
container:
175175
image: amd64/rust
176176
steps:
@@ -271,7 +271,7 @@ jobs:
271271
linux-test:
272272
name: cargo test (amd64)
273273
needs: linux-build-lib
274-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
274+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
275275
container:
276276
image: amd64/rust
277277
volumes:
@@ -322,7 +322,7 @@ jobs:
322322
linux-test-datafusion-cli:
323323
name: cargo test datafusion-cli (amd64)
324324
needs: linux-build-lib
325-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
325+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
326326
steps:
327327
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
328328
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -352,7 +352,7 @@ jobs:
352352
linux-test-example:
353353
name: cargo examples (amd64)
354354
needs: linux-build-lib
355-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
355+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
356356
container:
357357
image: amd64/rust
358358
steps:
@@ -383,7 +383,7 @@ jobs:
383383
linux-test-doc:
384384
name: cargo test doc (amd64)
385385
needs: linux-build-lib
386-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
386+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
387387
container:
388388
image: amd64/rust
389389
steps:
@@ -405,7 +405,7 @@ jobs:
405405
linux-rustdoc:
406406
name: cargo doc
407407
needs: linux-build-lib
408-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
408+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
409409
container:
410410
image: amd64/rust
411411
steps:
@@ -446,7 +446,7 @@ jobs:
446446
verify-benchmark-results:
447447
name: verify benchmark results (amd64)
448448
needs: linux-build-lib
449-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
449+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
450450
container:
451451
image: amd64/rust
452452
steps:
@@ -480,7 +480,7 @@ jobs:
480480
sqllogictest-postgres:
481481
name: "Run sqllogictest with Postgres runner"
482482
needs: linux-build-lib
483-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
483+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
484484
container:
485485
image: amd64/rust
486486
services:
@@ -519,7 +519,7 @@ jobs:
519519
sqllogictest-substrait:
520520
name: "Run sqllogictest in Substrait round-trip mode"
521521
needs: linux-build-lib
522-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
522+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
523523
container:
524524
image: amd64/rust
525525
steps:
@@ -650,7 +650,7 @@ jobs:
650650
clippy:
651651
name: clippy
652652
needs: linux-build-lib
653-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
653+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
654654
container:
655655
image: amd64/rust
656656
steps:
@@ -697,7 +697,7 @@ jobs:
697697
config-docs-check:
698698
name: check configs.md and ***_functions.md is up-to-date
699699
needs: linux-build-lib
700-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
700+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
701701
container:
702702
image: amd64/rust
703703
steps:

0 commit comments

Comments
 (0)