[SOL] Fix CI failures

anza-xyz · Feb 2, 2024 · c9f2a41 · c9f2a41
1 parent c3afa9e
commit c9f2a41
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,22 +54,21 @@ jobs:
       matrix:
         include:
           - name: mingw-check
-            os: ubuntu-20.04-4core-16gb
+            os: ubuntu-latest
             env: {}
           - name: mingw-check-tidy
-            os: ubuntu-20.04-4core-16gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-llvm-15
             env:
               ENABLE_GCC_CODEGEN: "1"
-            os: ubuntu-20.04-16core-64gb
-            env: {}
+            os: ubuntu-latest
           - name: sbf-solana-solana
             tidy: false
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-tools
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
             env: {}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
@@ -195,13 +194,13 @@ jobs:
       matrix:
         include:
           - name: mingw-check
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-llvm-12
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
             env: {}
           - name: sbf-solana-solana
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
             env: {}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
@@ -326,108 +325,108 @@ jobs:
               - ARM64
               - linux
           - name: arm-android
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: armhf-gnu
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-aarch64-linux
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
           - name: dist-android
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-arm-linux
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
             env: {}
           - name: dist-armhf-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-armv7-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-i586-gnu-i586-i686-musl
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-i686-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-loongarch64-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-powerpc-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-powerpc64-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-powerpc64le-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-riscv64-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-s390x-linux
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-various-1
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-various-2
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-x86_64-freebsd
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-x86_64-illumos
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: dist-x86_64-linux
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
           - name: dist-x86_64-linux-alt
             env:
               IMAGE: dist-x86_64-linux
               CODEGEN_BACKENDS: "llvm,cranelift"
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
           - name: dist-x86_64-musl
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
           - name: dist-x86_64-netbsd
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: i686-gnu
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: i686-gnu-nopt
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: mingw-check
-            os: ubuntu-20.04-4core-16gb
+            os: ubuntu-latest
             env: {}
           - name: test-various
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu
-            os: ubuntu-20.04-4core-16gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-stable
             env:
               IMAGE: x86_64-gnu
               RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
               CI_ONLY_WHEN_CHANNEL: nightly
-            os: ubuntu-20.04-4core-16gb
+            os: ubuntu-latest
           - name: x86_64-gnu-aux
-            os: ubuntu-20.04-4core-16gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-debug
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-distcheck
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-llvm-17
             env:
@@ -436,18 +435,18 @@ jobs:
           - name: x86_64-gnu-llvm-16
             env:
               RUST_BACKTRACE: 1
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
           - name: x86_64-gnu-llvm-15
             env:
               RUST_BACKTRACE: 1
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
           - name: x86_64-gnu-nopt
-            os: ubuntu-20.04-4core-16gb
+            os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-tools
             env:
               DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
           - name: dist-x86_64-apple
             env:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -718,7 +717,7 @@ jobs:
           - name: dist-x86_64-linux
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
-            os: ubuntu-20.04-16core-64gb
+            os: ubuntu-latest
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:

diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -13,10 +13,12 @@ Files: compiler/*
        tests/*
        src/*
        .github/*
+       build.sh
        Cargo.lock
        Cargo.toml
        CODE_OF_CONDUCT.md
        config.example.toml
+       config.toml
        configure
        CONTRIBUTING.md
        COPYRIGHT

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -79,15 +79,15 @@ x--expand-yaml-anchors--remove:
     env: {}
 
   - &job-linux-4c
-    os: ubuntu-20.04-4core-16gb
+    os: ubuntu-latest
     <<: *base-job
 
   - &job-linux-8c
-    os: ubuntu-20.04-8core-32gb
+    os: ubuntu-latest
     <<: *base-job
 
   - &job-linux-16c
-    os: ubuntu-20.04-16core-64gb
+    os: ubuntu-latest
     <<: *base-job
 
   - &job-macos-xl

diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
@@ -140,7 +140,6 @@ fn check_cfgs(
             || cfg.contains("target_env")
             || cfg.contains("target_abi")
             || cfg.contains("target_vendor")
-            || cfg.contains("target_family")
             || cfg.contains("unix")
             || cfg.contains("windows");
 

diff --git a/tests/ui/check-cfg/values-target-json.stderr b/tests/ui/check-cfg/values-target-json.stderr
@@ -6,7 +6,7 @@ LL | #[cfg(target_os = "linuz")]
    |                   |
    |                   help: there is a expected value with a similar name: `"linux"`
    |
-   = 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`
+   = 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`
    = note: `#[warn(unexpected_cfgs)]` on by default
 
 warning: 1 warning emitted