Skip to content

Commit 809849f

Browse files
dmakarovLucasSte
dmakarov
authored and
LucasSte
committed
[SOL] Fix CI failures
1 parent ad7e15c commit 809849f

File tree

5 files changed

+45
-65
lines changed

5 files changed

+45
-65
lines changed

‎.github/workflows/ci.yml

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,21 @@ jobs:
9494
matrix:
9595
include:
9696
- name: mingw-check
97-
os: ubuntu-20.04-4core-16gb
97+
os: ubuntu-latest
9898
env: {}
9999
- name: mingw-check-tidy
100-
os: ubuntu-20.04-4core-16gb
100+
os: ubuntu-latest
101101
env: {}
102102
- name: x86_64-gnu-llvm-15
103103
env:
104104
ENABLE_GCC_CODEGEN: "1"
105-
os: ubuntu-20.04-16core-64gb
106-
env: {}
105+
os: ubuntu-latest
107106
- name: sbf-solana-solana
108107
tidy: false
109-
os: ubuntu-20.04-16core-64gb
108+
os: ubuntu-latest
110109
env: {}
111110
- name: x86_64-gnu-tools
112-
os: ubuntu-20.04-16core-64gb
111+
os: ubuntu-latest
113112
env: {}
114113
timeout-minutes: 600
115114
runs-on: "${{ matrix.os }}"
@@ -300,13 +299,13 @@ jobs:
300299
matrix:
301300
include:
302301
- name: mingw-check
303-
os: ubuntu-20.04-16core-64gb
302+
os: ubuntu-latest
304303
env: {}
305304
- name: x86_64-gnu-llvm-12
306-
os: ubuntu-20.04-16core-64gb
305+
os: ubuntu-latest
307306
env: {}
308307
- name: sbf-solana-solana
309-
os: ubuntu-20.04-16core-64gb
308+
os: ubuntu-latest
310309
env: {}
311310
timeout-minutes: 600
312311
runs-on: "${{ matrix.os }}"
@@ -431,108 +430,108 @@ jobs:
431430
- ARM64
432431
- linux
433432
- name: arm-android
434-
os: ubuntu-20.04-8core-32gb
433+
os: ubuntu-latest
435434
env: {}
436435
- name: armhf-gnu
437-
os: ubuntu-20.04-8core-32gb
436+
os: ubuntu-latest
438437
env: {}
439438
- name: dist-aarch64-linux
440439
env:
441440
CODEGEN_BACKENDS: "llvm,cranelift"
442-
os: ubuntu-20.04-8core-32gb
441+
os: ubuntu-latest
443442
- name: dist-android
444-
os: ubuntu-20.04-8core-32gb
443+
os: ubuntu-latest
445444
env: {}
446445
- name: dist-arm-linux
447-
os: ubuntu-20.04-16core-64gb
446+
os: ubuntu-latest
448447
env: {}
449448
- name: dist-armhf-linux
450-
os: ubuntu-20.04-8core-32gb
449+
os: ubuntu-latest
451450
env: {}
452451
- name: dist-armv7-linux
453-
os: ubuntu-20.04-8core-32gb
452+
os: ubuntu-latest
454453
env: {}
455454
- name: dist-i586-gnu-i586-i686-musl
456-
os: ubuntu-20.04-8core-32gb
455+
os: ubuntu-latest
457456
env: {}
458457
- name: dist-i686-linux
459-
os: ubuntu-20.04-8core-32gb
458+
os: ubuntu-latest
460459
env: {}
461460
- name: dist-loongarch64-linux
462-
os: ubuntu-20.04-8core-32gb
461+
os: ubuntu-latest
463462
env: {}
464463
- name: dist-powerpc-linux
465-
os: ubuntu-20.04-8core-32gb
464+
os: ubuntu-latest
466465
env: {}
467466
- name: dist-powerpc64-linux
468-
os: ubuntu-20.04-8core-32gb
467+
os: ubuntu-latest
469468
env: {}
470469
- name: dist-powerpc64le-linux
471-
os: ubuntu-20.04-8core-32gb
470+
os: ubuntu-latest
472471
env: {}
473472
- name: dist-riscv64-linux
474-
os: ubuntu-20.04-8core-32gb
473+
os: ubuntu-latest
475474
env: {}
476475
- name: dist-s390x-linux
477-
os: ubuntu-20.04-8core-32gb
476+
os: ubuntu-latest
478477
env: {}
479478
- name: dist-various-1
480-
os: ubuntu-20.04-8core-32gb
479+
os: ubuntu-latest
481480
env: {}
482481
- name: dist-various-2
483-
os: ubuntu-20.04-8core-32gb
482+
os: ubuntu-latest
484483
env: {}
485484
- name: dist-x86_64-freebsd
486-
os: ubuntu-20.04-8core-32gb
485+
os: ubuntu-latest
487486
env: {}
488487
- name: dist-x86_64-illumos
489-
os: ubuntu-20.04-8core-32gb
488+
os: ubuntu-latest
490489
env: {}
491490
- name: dist-x86_64-linux
492491
env:
493492
CODEGEN_BACKENDS: "llvm,cranelift"
494-
os: ubuntu-20.04-16core-64gb
493+
os: ubuntu-latest
495494
- name: dist-x86_64-linux-alt
496495
env:
497496
IMAGE: dist-x86_64-linux
498497
CODEGEN_BACKENDS: "llvm,cranelift"
499-
os: ubuntu-20.04-16core-64gb
498+
os: ubuntu-latest
500499
- name: dist-x86_64-musl
501500
env:
502501
CODEGEN_BACKENDS: "llvm,cranelift"
503-
os: ubuntu-20.04-8core-32gb
502+
os: ubuntu-latest
504503
- name: dist-x86_64-netbsd
505-
os: ubuntu-20.04-8core-32gb
504+
os: ubuntu-latest
506505
env: {}
507506
- name: i686-gnu
508-
os: ubuntu-20.04-8core-32gb
507+
os: ubuntu-latest
509508
env: {}
510509
- name: i686-gnu-nopt
511-
os: ubuntu-20.04-8core-32gb
510+
os: ubuntu-latest
512511
env: {}
513512
- name: mingw-check
514-
os: ubuntu-20.04-4core-16gb
513+
os: ubuntu-latest
515514
env: {}
516515
- name: test-various
517-
os: ubuntu-20.04-8core-32gb
516+
os: ubuntu-latest
518517
env: {}
519518
- name: x86_64-gnu
520-
os: ubuntu-20.04-4core-16gb
519+
os: ubuntu-latest
521520
env: {}
522521
- name: x86_64-gnu-stable
523522
env:
524523
IMAGE: x86_64-gnu
525524
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
526525
CI_ONLY_WHEN_CHANNEL: nightly
527-
os: ubuntu-20.04-4core-16gb
526+
os: ubuntu-latest
528527
- name: x86_64-gnu-aux
529-
os: ubuntu-20.04-4core-16gb
528+
os: ubuntu-latest
530529
env: {}
531530
- name: x86_64-gnu-debug
532-
os: ubuntu-20.04-8core-32gb
531+
os: ubuntu-latest
533532
env: {}
534533
- name: x86_64-gnu-distcheck
535-
os: ubuntu-20.04-8core-32gb
534+
os: ubuntu-latest
536535
env: {}
537536
- name: x86_64-gnu-llvm-17
538537
env:
@@ -541,18 +540,18 @@ jobs:
541540
- name: x86_64-gnu-llvm-16
542541
env:
543542
RUST_BACKTRACE: 1
544-
os: ubuntu-20.04-8core-32gb
543+
os: ubuntu-latest
545544
- name: x86_64-gnu-llvm-15
546545
env:
547546
RUST_BACKTRACE: 1
548-
os: ubuntu-20.04-8core-32gb
547+
os: ubuntu-latest
549548
- name: x86_64-gnu-nopt
550-
os: ubuntu-20.04-4core-16gb
549+
os: ubuntu-latest
551550
env: {}
552551
- name: x86_64-gnu-tools
553552
env:
554553
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
555-
os: ubuntu-20.04-8core-32gb
554+
os: ubuntu-latest
556555
- name: dist-x86_64-apple
557556
env:
558557
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -823,7 +822,7 @@ jobs:
823822
- name: dist-x86_64-linux
824823
env:
825824
CODEGEN_BACKENDS: "llvm,cranelift"
826-
os: ubuntu-20.04-16core-64gb
825+
os: ubuntu-latest
827826
timeout-minutes: 600
828827
runs-on: "${{ matrix.os }}"
829828
steps:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ fn check_cfgs(
144144
|| cfg.contains("target_env")
145145
|| cfg.contains("target_abi")
146146
|| cfg.contains("target_vendor")
147-
|| cfg.contains("target_family")
148147
|| cfg.contains("unix")
149148
|| cfg.contains("windows");
150149

‎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)