Skip to content

Commit 6d39672

Browse files
dmakarovLucasSte
dmakarov
authored and
LucasSte
committed
[SOL] Fix CI failures
1 parent 9cabb40 commit 6d39672

File tree

7 files changed

+50
-68
lines changed

7 files changed

+50
-68
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,21 @@ jobs:
6666
matrix:
6767
include:
6868
- name: mingw-check
69-
os: ubuntu-20.04-4core-16gb
69+
os: ubuntu-latest
7070
env: {}
7171
- name: mingw-check-tidy
72-
os: ubuntu-20.04-4core-16gb
72+
os: ubuntu-latest
7373
env: {}
7474
- name: x86_64-gnu-llvm-15
7575
env:
7676
ENABLE_GCC_CODEGEN: "1"
77-
os: ubuntu-20.04-16core-64gb
78-
env: {}
77+
os: ubuntu-latest
7978
- name: sbf-solana-solana
8079
tidy: false
81-
os: ubuntu-20.04-16core-64gb
80+
os: ubuntu-latest
8281
env: {}
8382
- name: x86_64-gnu-tools
84-
os: ubuntu-20.04-16core-64gb
83+
os: ubuntu-latest
8584
env: {}
8685
timeout-minutes: 600
8786
runs-on: "${{ matrix.os }}"
@@ -193,13 +192,13 @@ jobs:
193192
matrix:
194193
include:
195194
- name: mingw-check
196-
os: ubuntu-20.04-16core-64gb
195+
os: ubuntu-latest
197196
env: {}
198197
- name: x86_64-gnu-llvm-12
199-
os: ubuntu-20.04-16core-64gb
198+
os: ubuntu-latest
200199
env: {}
201200
- name: sbf-solana-solana
202-
os: ubuntu-20.04-16core-64gb
201+
os: ubuntu-latest
203202
env: {}
204203
timeout-minutes: 600
205204
runs-on: "${{ matrix.os }}"
@@ -324,108 +323,108 @@ jobs:
324323
- ARM64
325324
- linux
326325
- name: arm-android
327-
os: ubuntu-20.04-8core-32gb
326+
os: ubuntu-latest
328327
env: {}
329328
- name: armhf-gnu
330-
os: ubuntu-20.04-8core-32gb
329+
os: ubuntu-latest
331330
env: {}
332331
- name: dist-aarch64-linux
333332
env:
334333
CODEGEN_BACKENDS: "llvm,cranelift"
335-
os: ubuntu-20.04-8core-32gb
334+
os: ubuntu-latest
336335
- name: dist-android
337-
os: ubuntu-20.04-8core-32gb
336+
os: ubuntu-latest
338337
env: {}
339338
- name: dist-arm-linux
340-
os: ubuntu-20.04-16core-64gb
339+
os: ubuntu-latest
341340
env: {}
342341
- name: dist-armhf-linux
343-
os: ubuntu-20.04-8core-32gb
342+
os: ubuntu-latest
344343
env: {}
345344
- name: dist-armv7-linux
346-
os: ubuntu-20.04-8core-32gb
345+
os: ubuntu-latest
347346
env: {}
348347
- name: dist-i586-gnu-i586-i686-musl
349-
os: ubuntu-20.04-8core-32gb
348+
os: ubuntu-latest
350349
env: {}
351350
- name: dist-i686-linux
352-
os: ubuntu-20.04-8core-32gb
351+
os: ubuntu-latest
353352
env: {}
354353
- name: dist-loongarch64-linux
355-
os: ubuntu-20.04-8core-32gb
354+
os: ubuntu-latest
356355
env: {}
357356
- name: dist-powerpc-linux
358-
os: ubuntu-20.04-8core-32gb
357+
os: ubuntu-latest
359358
env: {}
360359
- name: dist-powerpc64-linux
361-
os: ubuntu-20.04-8core-32gb
360+
os: ubuntu-latest
362361
env: {}
363362
- name: dist-powerpc64le-linux
364-
os: ubuntu-20.04-8core-32gb
363+
os: ubuntu-latest
365364
env: {}
366365
- name: dist-riscv64-linux
367-
os: ubuntu-20.04-8core-32gb
366+
os: ubuntu-latest
368367
env: {}
369368
- name: dist-s390x-linux
370-
os: ubuntu-20.04-8core-32gb
369+
os: ubuntu-latest
371370
env: {}
372371
- name: dist-various-1
373-
os: ubuntu-20.04-8core-32gb
372+
os: ubuntu-latest
374373
env: {}
375374
- name: dist-various-2
376-
os: ubuntu-20.04-8core-32gb
375+
os: ubuntu-latest
377376
env: {}
378377
- name: dist-x86_64-freebsd
379-
os: ubuntu-20.04-8core-32gb
378+
os: ubuntu-latest
380379
env: {}
381380
- name: dist-x86_64-illumos
382-
os: ubuntu-20.04-8core-32gb
381+
os: ubuntu-latest
383382
env: {}
384383
- name: dist-x86_64-linux
385384
env:
386385
CODEGEN_BACKENDS: "llvm,cranelift"
387-
os: ubuntu-20.04-16core-64gb
386+
os: ubuntu-latest
388387
- name: dist-x86_64-linux-alt
389388
env:
390389
IMAGE: dist-x86_64-linux
391390
CODEGEN_BACKENDS: "llvm,cranelift"
392-
os: ubuntu-20.04-16core-64gb
391+
os: ubuntu-latest
393392
- name: dist-x86_64-musl
394393
env:
395394
CODEGEN_BACKENDS: "llvm,cranelift"
396-
os: ubuntu-20.04-8core-32gb
395+
os: ubuntu-latest
397396
- name: dist-x86_64-netbsd
398-
os: ubuntu-20.04-8core-32gb
397+
os: ubuntu-latest
399398
env: {}
400399
- name: i686-gnu
401-
os: ubuntu-20.04-8core-32gb
400+
os: ubuntu-latest
402401
env: {}
403402
- name: i686-gnu-nopt
404-
os: ubuntu-20.04-8core-32gb
403+
os: ubuntu-latest
405404
env: {}
406405
- name: mingw-check
407-
os: ubuntu-20.04-4core-16gb
406+
os: ubuntu-latest
408407
env: {}
409408
- name: test-various
410-
os: ubuntu-20.04-8core-32gb
409+
os: ubuntu-latest
411410
env: {}
412411
- name: x86_64-gnu
413-
os: ubuntu-20.04-4core-16gb
412+
os: ubuntu-latest
414413
env: {}
415414
- name: x86_64-gnu-stable
416415
env:
417416
IMAGE: x86_64-gnu
418417
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
419418
CI_ONLY_WHEN_CHANNEL: nightly
420-
os: ubuntu-20.04-4core-16gb
419+
os: ubuntu-latest
421420
- name: x86_64-gnu-aux
422-
os: ubuntu-20.04-4core-16gb
421+
os: ubuntu-latest
423422
env: {}
424423
- name: x86_64-gnu-debug
425-
os: ubuntu-20.04-8core-32gb
424+
os: ubuntu-latest
426425
env: {}
427426
- name: x86_64-gnu-distcheck
428-
os: ubuntu-20.04-8core-32gb
427+
os: ubuntu-latest
429428
env: {}
430429
- name: x86_64-gnu-llvm-17
431430
env:
@@ -434,18 +433,18 @@ jobs:
434433
- name: x86_64-gnu-llvm-16
435434
env:
436435
RUST_BACKTRACE: 1
437-
os: ubuntu-20.04-8core-32gb
436+
os: ubuntu-latest
438437
- name: x86_64-gnu-llvm-15
439438
env:
440439
RUST_BACKTRACE: 1
441-
os: ubuntu-20.04-8core-32gb
440+
os: ubuntu-latest
442441
- name: x86_64-gnu-nopt
443-
os: ubuntu-20.04-4core-16gb
442+
os: ubuntu-latest
444443
env: {}
445444
- name: x86_64-gnu-tools
446445
env:
447446
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
448-
os: ubuntu-20.04-8core-32gb
447+
os: ubuntu-latest
449448
- name: dist-x86_64-apple
450449
env:
451450
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -716,7 +715,7 @@ jobs:
716715
- name: dist-x86_64-linux
717716
env:
718717
CODEGEN_BACKENDS: "llvm,cranelift"
719-
os: ubuntu-20.04-16core-64gb
718+
os: ubuntu-latest
720719
timeout-minutes: 600
721720
runs-on: "${{ matrix.os }}"
722721
steps:

‎.reuse/dep5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ Files: compiler/*
1111
tests/*
1212
src/*
1313
.github/*
14+
build.sh
1415
Cargo.lock
1516
Cargo.toml
1617
CODE_OF_CONDUCT.md
1718
config.example.toml
19+
config.toml
1820
configure
1921
CONTRIBUTING.md
2022
COPYRIGHT

‎src/ci/github-actions/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ x--expand-yaml-anchors--remove:
8080
env: {}
8181

8282
- &job-linux-4c
83-
os: ubuntu-20.04-4core-16gb
83+
os: ubuntu-latest
8484
<<: *base-job
8585

8686
- &job-linux-8c
87-
os: ubuntu-20.04-8core-32gb
87+
os: ubuntu-latest
8888
<<: *base-job
8989

9090
- &job-linux-16c
91-
os: ubuntu-20.04-16core-64gb
91+
os: ubuntu-latest
9292
<<: *base-job
9393

9494
- &job-macos-xl

‎src/tools/tidy/src/pal.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ fn check_cfgs(
140140
|| cfg.contains("target_env")
141141
|| cfg.contains("target_abi")
142142
|| cfg.contains("target_vendor")
143-
|| cfg.contains("target_family")
144143
|| cfg.contains("unix")
145144
|| cfg.contains("windows");
146145

‎tests/ui/linkage-attr/unstable-flavor.bpf.stderr‎

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

‎tests/ui/linkage-attr/unstable-flavor.ptx.stderr‎

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

‎tests/ui/linkage-attr/unstable-flavor.rs‎

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

0 commit comments

Comments
 (0)