Skip to content

Commit df535d9

Browse files
dmakarovLucasSte
dmakarov
authored and
LucasSte
committed
[SOL] Fix CI failures
1 parent e55ed43 commit df535d9

File tree

8 files changed

+51
-69
lines changed

8 files changed

+51
-69
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,21 @@ jobs:
5454
matrix:
5555
include:
5656
- name: mingw-check
57-
os: ubuntu-20.04-4core-16gb
57+
os: ubuntu-latest
5858
env: {}
5959
- name: mingw-check-tidy
60-
os: ubuntu-20.04-4core-16gb
60+
os: ubuntu-latest
6161
env: {}
6262
- name: x86_64-gnu-llvm-15
6363
env:
6464
ENABLE_GCC_CODEGEN: "1"
65-
os: ubuntu-20.04-16core-64gb
66-
env: {}
65+
os: ubuntu-latest
6766
- name: sbf-solana-solana
6867
tidy: false
69-
os: ubuntu-20.04-16core-64gb
68+
os: ubuntu-latest
7069
env: {}
7170
- name: x86_64-gnu-tools
72-
os: ubuntu-20.04-16core-64gb
71+
os: ubuntu-latest
7372
env: {}
7473
timeout-minutes: 600
7574
runs-on: "${{ matrix.os }}"
@@ -195,13 +194,13 @@ jobs:
195194
matrix:
196195
include:
197196
- name: mingw-check
198-
os: ubuntu-20.04-16core-64gb
197+
os: ubuntu-latest
199198
env: {}
200199
- name: x86_64-gnu-llvm-12
201-
os: ubuntu-20.04-16core-64gb
200+
os: ubuntu-latest
202201
env: {}
203202
- name: sbf-solana-solana
204-
os: ubuntu-20.04-16core-64gb
203+
os: ubuntu-latest
205204
env: {}
206205
timeout-minutes: 600
207206
runs-on: "${{ matrix.os }}"
@@ -326,108 +325,108 @@ jobs:
326325
- ARM64
327326
- linux
328327
- name: arm-android
329-
os: ubuntu-20.04-8core-32gb
328+
os: ubuntu-latest
330329
env: {}
331330
- name: armhf-gnu
332-
os: ubuntu-20.04-8core-32gb
331+
os: ubuntu-latest
333332
env: {}
334333
- name: dist-aarch64-linux
335334
env:
336335
CODEGEN_BACKENDS: "llvm,cranelift"
337-
os: ubuntu-20.04-8core-32gb
336+
os: ubuntu-latest
338337
- name: dist-android
339-
os: ubuntu-20.04-8core-32gb
338+
os: ubuntu-latest
340339
env: {}
341340
- name: dist-arm-linux
342-
os: ubuntu-20.04-16core-64gb
341+
os: ubuntu-latest
343342
env: {}
344343
- name: dist-armhf-linux
345-
os: ubuntu-20.04-8core-32gb
344+
os: ubuntu-latest
346345
env: {}
347346
- name: dist-armv7-linux
348-
os: ubuntu-20.04-8core-32gb
347+
os: ubuntu-latest
349348
env: {}
350349
- name: dist-i586-gnu-i586-i686-musl
351-
os: ubuntu-20.04-8core-32gb
350+
os: ubuntu-latest
352351
env: {}
353352
- name: dist-i686-linux
354-
os: ubuntu-20.04-8core-32gb
353+
os: ubuntu-latest
355354
env: {}
356355
- name: dist-loongarch64-linux
357-
os: ubuntu-20.04-8core-32gb
356+
os: ubuntu-latest
358357
env: {}
359358
- name: dist-powerpc-linux
360-
os: ubuntu-20.04-8core-32gb
359+
os: ubuntu-latest
361360
env: {}
362361
- name: dist-powerpc64-linux
363-
os: ubuntu-20.04-8core-32gb
362+
os: ubuntu-latest
364363
env: {}
365364
- name: dist-powerpc64le-linux
366-
os: ubuntu-20.04-8core-32gb
365+
os: ubuntu-latest
367366
env: {}
368367
- name: dist-riscv64-linux
369-
os: ubuntu-20.04-8core-32gb
368+
os: ubuntu-latest
370369
env: {}
371370
- name: dist-s390x-linux
372-
os: ubuntu-20.04-8core-32gb
371+
os: ubuntu-latest
373372
env: {}
374373
- name: dist-various-1
375-
os: ubuntu-20.04-8core-32gb
374+
os: ubuntu-latest
376375
env: {}
377376
- name: dist-various-2
378-
os: ubuntu-20.04-8core-32gb
377+
os: ubuntu-latest
379378
env: {}
380379
- name: dist-x86_64-freebsd
381-
os: ubuntu-20.04-8core-32gb
380+
os: ubuntu-latest
382381
env: {}
383382
- name: dist-x86_64-illumos
384-
os: ubuntu-20.04-8core-32gb
383+
os: ubuntu-latest
385384
env: {}
386385
- name: dist-x86_64-linux
387386
env:
388387
CODEGEN_BACKENDS: "llvm,cranelift"
389-
os: ubuntu-20.04-16core-64gb
388+
os: ubuntu-latest
390389
- name: dist-x86_64-linux-alt
391390
env:
392391
IMAGE: dist-x86_64-linux
393392
CODEGEN_BACKENDS: "llvm,cranelift"
394-
os: ubuntu-20.04-16core-64gb
393+
os: ubuntu-latest
395394
- name: dist-x86_64-musl
396395
env:
397396
CODEGEN_BACKENDS: "llvm,cranelift"
398-
os: ubuntu-20.04-8core-32gb
397+
os: ubuntu-latest
399398
- name: dist-x86_64-netbsd
400-
os: ubuntu-20.04-8core-32gb
399+
os: ubuntu-latest
401400
env: {}
402401
- name: i686-gnu
403-
os: ubuntu-20.04-8core-32gb
402+
os: ubuntu-latest
404403
env: {}
405404
- name: i686-gnu-nopt
406-
os: ubuntu-20.04-8core-32gb
405+
os: ubuntu-latest
407406
env: {}
408407
- name: mingw-check
409-
os: ubuntu-20.04-4core-16gb
408+
os: ubuntu-latest
410409
env: {}
411410
- name: test-various
412-
os: ubuntu-20.04-8core-32gb
411+
os: ubuntu-latest
413412
env: {}
414413
- name: x86_64-gnu
415-
os: ubuntu-20.04-4core-16gb
414+
os: ubuntu-latest
416415
env: {}
417416
- name: x86_64-gnu-stable
418417
env:
419418
IMAGE: x86_64-gnu
420419
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
421420
CI_ONLY_WHEN_CHANNEL: nightly
422-
os: ubuntu-20.04-4core-16gb
421+
os: ubuntu-latest
423422
- name: x86_64-gnu-aux
424-
os: ubuntu-20.04-4core-16gb
423+
os: ubuntu-latest
425424
env: {}
426425
- name: x86_64-gnu-debug
427-
os: ubuntu-20.04-8core-32gb
426+
os: ubuntu-latest
428427
env: {}
429428
- name: x86_64-gnu-distcheck
430-
os: ubuntu-20.04-8core-32gb
429+
os: ubuntu-latest
431430
env: {}
432431
- name: x86_64-gnu-llvm-17
433432
env:
@@ -436,18 +435,18 @@ jobs:
436435
- name: x86_64-gnu-llvm-16
437436
env:
438437
RUST_BACKTRACE: 1
439-
os: ubuntu-20.04-8core-32gb
438+
os: ubuntu-latest
440439
- name: x86_64-gnu-llvm-15
441440
env:
442441
RUST_BACKTRACE: 1
443-
os: ubuntu-20.04-8core-32gb
442+
os: ubuntu-latest
444443
- name: x86_64-gnu-nopt
445-
os: ubuntu-20.04-4core-16gb
444+
os: ubuntu-latest
446445
env: {}
447446
- name: x86_64-gnu-tools
448447
env:
449448
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
450-
os: ubuntu-20.04-8core-32gb
449+
os: ubuntu-latest
451450
- name: dist-x86_64-apple
452451
env:
453452
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -718,7 +717,7 @@ jobs:
718717
- name: dist-x86_64-linux
719718
env:
720719
CODEGEN_BACKENDS: "llvm,cranelift"
721-
os: ubuntu-20.04-16core-64gb
720+
os: ubuntu-latest
722721
timeout-minutes: 600
723722
runs-on: "${{ matrix.os }}"
724723
steps:

‎.reuse/dep5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ Files: compiler/*
1313
tests/*
1414
src/*
1515
.github/*
16+
build.sh
1617
Cargo.lock
1718
Cargo.toml
1819
CODE_OF_CONDUCT.md
1920
config.example.toml
21+
config.toml
2022
configure
2123
CONTRIBUTING.md
2224
COPYRIGHT

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

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

8181
- &job-linux-4c
82-
os: ubuntu-20.04-4core-16gb
82+
os: ubuntu-latest
8383
<<: *base-job
8484

8585
- &job-linux-8c
86-
os: ubuntu-20.04-8core-32gb
86+
os: ubuntu-latest
8787
<<: *base-job
8888

8989
- &job-linux-16c
90-
os: ubuntu-20.04-16core-64gb
90+
os: ubuntu-latest
9191
<<: *base-job
9292

9393
- &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/check-cfg/values-target-json.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | #[cfg(target_os = "linuz")]
66
| |
77
| help: there is a expected value with a similar name: `"linux"`
88
|
9-
= note: expected values for `target_os` are: `aix`, `android`, `cuda`, `dragonfly`, `emscripten`, `ericos`, `espidf`, `freebsd`, `fuchsia`, `haiku`, `hermit`, `horizon`, `hurd`, `illumos`, `ios`, `l4re`, `linux`, `macos`, `netbsd`, `none`, `nto`, `openbsd`, `psp`, `redox`, `solaris`, `solid_asp3`, `teeos`, `tvos`, `uefi`, `unknown`, `vita`, `vxworks`, `wasi`, `watchos`, `windows`, `xous`
9+
= note: expected values for `target_os` are: `aix`, `android`, `cuda`, `dragonfly`, `emscripten`, `ericos`, `espidf`, `freebsd`, `fuchsia`, `haiku`, `hermit`, `horizon`, `hurd`, `illumos`, `ios`, `l4re`, `linux`, `macos`, `netbsd`, `none`, `nto`, `openbsd`, `psp`, `redox`, `solana`, `solaris`, `solid_asp3`, `teeos`, `tvos`, `uefi`, `unknown`, `vita`, `vxworks`, `wasi`, `watchos`, `windows`, `xous`
1010
= note: `#[warn(unexpected_cfgs)]` on by default
1111

1212
warning: 1 warning emitted

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