Skip to content

Commit 3c7a160

Browse files
dmakarovc410-f3r
dmakarov
authored and
c410-f3r
committed
[SOL] Fix CI failures
1 parent 1d33ca1 commit 3c7a160

File tree

5 files changed

+41
-61
lines changed

5 files changed

+41
-61
lines changed

‎.github/workflows/ci.yml

+41-42
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,21 @@ jobs:
8181
matrix:
8282
include:
8383
- name: mingw-check
84-
os: ubuntu-20.04-4core-16gb
84+
os: ubuntu-latest
8585
env: {}
8686
- name: mingw-check-tidy
87-
os: ubuntu-20.04-4core-16gb
87+
os: ubuntu-latest
8888
env: {}
8989
- name: x86_64-gnu-llvm-15
9090
env:
9191
ENABLE_GCC_CODEGEN: "1"
92-
os: ubuntu-20.04-16core-64gb
93-
env: {}
92+
os: ubuntu-latest
9493
- name: sbf-solana-solana
9594
tidy: false
9695
os: ubuntu-latest
9796
env: {}
9897
- name: x86_64-gnu-tools
99-
os: ubuntu-20.04-16core-64gb
98+
os: ubuntu-latest
10099
env: {}
101100
steps:
102101
- if: contains(matrix.os, 'windows')
@@ -369,108 +368,108 @@ jobs:
369368
- ARM64
370369
- linux
371370
- name: arm-android
372-
os: ubuntu-20.04-8core-32gb
371+
os: ubuntu-latest
373372
env: {}
374373
- name: armhf-gnu
375-
os: ubuntu-20.04-8core-32gb
374+
os: ubuntu-latest
376375
env: {}
377376
- name: dist-aarch64-linux
378377
env:
379378
CODEGEN_BACKENDS: "llvm,cranelift"
380-
os: ubuntu-20.04-8core-32gb
379+
os: ubuntu-latest
381380
- name: dist-android
382-
os: ubuntu-20.04-8core-32gb
381+
os: ubuntu-latest
383382
env: {}
384383
- name: dist-arm-linux
385-
os: ubuntu-20.04-16core-64gb
384+
os: ubuntu-latest
386385
env: {}
387386
- name: dist-armhf-linux
388-
os: ubuntu-20.04-8core-32gb
387+
os: ubuntu-latest
389388
env: {}
390389
- name: dist-armv7-linux
391-
os: ubuntu-20.04-8core-32gb
390+
os: ubuntu-latest
392391
env: {}
393392
- name: dist-i586-gnu-i586-i686-musl
394-
os: ubuntu-20.04-8core-32gb
393+
os: ubuntu-latest
395394
env: {}
396395
- name: dist-i686-linux
397-
os: ubuntu-20.04-8core-32gb
396+
os: ubuntu-latest
398397
env: {}
399398
- name: dist-loongarch64-linux
400-
os: ubuntu-20.04-8core-32gb
399+
os: ubuntu-latest
401400
env: {}
402401
- name: dist-powerpc-linux
403-
os: ubuntu-20.04-8core-32gb
402+
os: ubuntu-latest
404403
env: {}
405404
- name: dist-powerpc64-linux
406-
os: ubuntu-20.04-8core-32gb
405+
os: ubuntu-latest
407406
env: {}
408407
- name: dist-powerpc64le-linux
409-
os: ubuntu-20.04-8core-32gb
408+
os: ubuntu-latest
410409
env: {}
411410
- name: dist-riscv64-linux
412-
os: ubuntu-20.04-8core-32gb
411+
os: ubuntu-latest
413412
env: {}
414413
- name: dist-s390x-linux
415-
os: ubuntu-20.04-8core-32gb
414+
os: ubuntu-latest
416415
env: {}
417416
- name: dist-various-1
418-
os: ubuntu-20.04-8core-32gb
417+
os: ubuntu-latest
419418
env: {}
420419
- name: dist-various-2
421-
os: ubuntu-20.04-8core-32gb
420+
os: ubuntu-latest
422421
env: {}
423422
- name: dist-x86_64-freebsd
424-
os: ubuntu-20.04-8core-32gb
423+
os: ubuntu-latest
425424
env: {}
426425
- name: dist-x86_64-illumos
427-
os: ubuntu-20.04-8core-32gb
426+
os: ubuntu-latest
428427
env: {}
429428
- name: dist-x86_64-linux
430429
env:
431430
CODEGEN_BACKENDS: "llvm,cranelift"
432-
os: ubuntu-20.04-16core-64gb
431+
os: ubuntu-latest
433432
- name: dist-x86_64-linux-alt
434433
env:
435434
IMAGE: dist-x86_64-linux
436435
CODEGEN_BACKENDS: "llvm,cranelift"
437-
os: ubuntu-20.04-16core-64gb
436+
os: ubuntu-latest
438437
- name: dist-x86_64-musl
439438
env:
440439
CODEGEN_BACKENDS: "llvm,cranelift"
441-
os: ubuntu-20.04-8core-32gb
440+
os: ubuntu-latest
442441
- name: dist-x86_64-netbsd
443-
os: ubuntu-20.04-8core-32gb
442+
os: ubuntu-latest
444443
env: {}
445444
- name: i686-gnu
446-
os: ubuntu-20.04-8core-32gb
445+
os: ubuntu-latest
447446
env: {}
448447
- name: i686-gnu-nopt
449-
os: ubuntu-20.04-8core-32gb
448+
os: ubuntu-latest
450449
env: {}
451450
- name: mingw-check
452-
os: ubuntu-20.04-4core-16gb
451+
os: ubuntu-latest
453452
env: {}
454453
- name: test-various
455-
os: ubuntu-20.04-8core-32gb
454+
os: ubuntu-latest
456455
env: {}
457456
- name: x86_64-gnu
458-
os: ubuntu-20.04-4core-16gb
457+
os: ubuntu-latest
459458
env: {}
460459
- name: x86_64-gnu-stable
461460
env:
462461
IMAGE: x86_64-gnu
463462
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
464463
CI_ONLY_WHEN_CHANNEL: nightly
465-
os: ubuntu-20.04-4core-16gb
464+
os: ubuntu-latest
466465
- name: x86_64-gnu-aux
467-
os: ubuntu-20.04-4core-16gb
466+
os: ubuntu-latest
468467
env: {}
469468
- name: x86_64-gnu-debug
470-
os: ubuntu-20.04-8core-32gb
469+
os: ubuntu-latest
471470
env: {}
472471
- name: x86_64-gnu-distcheck
473-
os: ubuntu-20.04-8core-32gb
472+
os: ubuntu-latest
474473
env: {}
475474
- name: x86_64-gnu-llvm-17
476475
env:
@@ -479,18 +478,18 @@ jobs:
479478
- name: x86_64-gnu-llvm-16
480479
env:
481480
RUST_BACKTRACE: 1
482-
os: ubuntu-20.04-8core-32gb
481+
os: ubuntu-latest
483482
- name: x86_64-gnu-llvm-15
484483
env:
485484
RUST_BACKTRACE: 1
486-
os: ubuntu-20.04-8core-32gb
485+
os: ubuntu-latest
487486
- name: x86_64-gnu-nopt
488-
os: ubuntu-20.04-4core-16gb
487+
os: ubuntu-latest
489488
env: {}
490489
- name: x86_64-gnu-tools
491490
env:
492491
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
493-
os: ubuntu-20.04-8core-32gb
492+
os: ubuntu-latest
494493
- name: dist-x86_64-apple
495494
env:
496495
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -763,7 +762,7 @@ jobs:
763762
- name: dist-x86_64-linux
764763
env:
765764
CODEGEN_BACKENDS: "llvm,cranelift"
766-
os: ubuntu-20.04-16core-64gb
765+
os: ubuntu-latest
767766
timeout-minutes: 600
768767
runs-on: "${{ matrix.os }}"
769768
steps:

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

-1
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

-2
This file was deleted.

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

-2
This file was deleted.

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

-14
This file was deleted.

0 commit comments

Comments
 (0)