diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 20b03c4348454..c8320056f15fc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,7 +28,7 @@ defaults: jobs: style_check: name: Style check - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 @@ -43,7 +43,7 @@ jobs: name: Clippy on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04, macos-26, windows-2025] + os: [ubuntu-26.04, macos-26, windows-2025] runs-on: ${{ matrix.os }} timeout-minutes: 10 steps: @@ -73,7 +73,7 @@ jobs: only: '(aarch64|x86_64)' # just a spot check for beta - toolchain: stable - toolchain: 1.65.0 # msrv - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 timeout-minutes: 25 env: TOOLCHAIN: ${{ matrix.toolchain }} @@ -131,7 +131,7 @@ jobs: - target: aarch64-pc-windows-msvc os: windows-11-arm - target: aarch64-unknown-linux-gnu - os: ubuntu-24.04-arm + os: ubuntu-26.04-arm - target: i686-pc-windows-gnu os: windows-2025 - target: i686-pc-windows-msvc @@ -142,7 +142,7 @@ jobs: - target: x86_64-pc-windows-msvc os: windows-2025 - target: x86_64-unknown-linux-gnu - runs-on: ${{ matrix.os && matrix.os || 'ubuntu-24.04' }} + runs-on: ${{ matrix.os && matrix.os || 'ubuntu-26.04' }} timeout-minutes: 25 env: TARGET: ${{ matrix.target }} @@ -240,7 +240,7 @@ jobs: # FIXME(ppc): SIGILL running tests, see # https://github.com/rust-lang/libc/pull/4254#issuecomment-2636288713 # - target: powerpc-unknown-linux-gnu - runs-on: ${{ matrix.os && matrix.os || 'ubuntu-24.04' }} + runs-on: ${{ matrix.os && matrix.os || 'ubuntu-26.04' }} timeout-minutes: 25 env: TARGET: ${{ matrix.target }} @@ -362,7 +362,7 @@ jobs: ctest_msrv: name: Check ctest MSRV - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 timeout-minutes: 10 env: RUSTFLAGS: "" # No need to check warnings on old MSRV, clear `-Dwarnings` @@ -384,7 +384,7 @@ jobs: docs: name: Ensure docs build - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 @@ -399,7 +399,7 @@ jobs: # protection, rather than having to add each job separately. success: name: success - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 needs: - style_check - test_tier1 diff --git a/ci/run.sh b/ci/run.sh index 96e5750945df4..c3a726b4c88b6 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -13,8 +13,9 @@ export RUSTFLAGS="${EXTRA_RUSTFLAGS:-} ${RUSTFLAGS:-}" echo "RUSTFLAGS: '$RUSTFLAGS'" -# For logging +# Print system and libc version for logging if available uname -a +dpkg -l | grep libc- || true cmd="cargo test --target $target ${LIBC_CI_ZBUILD_STD+"-Zbuild-std"}" test_flags="--skip check_style" diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index 4e3f8a1f4b678..b262ff8a142c7 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -3103,7 +3103,6 @@ pub const KERN_PROF: c_int = 6; pub const KERN_NODENAME: c_int = 7; pub const KERN_DOMAINNAME: c_int = 8; pub const KERN_PANIC: c_int = 15; -pub const KERN_REALROOTDEV: c_int = 16; pub const KERN_SPARC_REBOOT: c_int = 21; pub const KERN_CTLALTDEL: c_int = 22; pub const KERN_PRINTK: c_int = 23; @@ -3173,7 +3172,6 @@ pub const VM_SWAPPINESS: c_int = 19; pub const VM_LOWMEM_RESERVE_RATIO: c_int = 20; pub const VM_MIN_FREE_KBYTES: c_int = 21; pub const VM_MAX_MAP_COUNT: c_int = 22; -pub const VM_LAPTOP_MODE: c_int = 23; pub const VM_BLOCK_DUMP: c_int = 24; pub const VM_HUGETLB_GROUP: c_int = 25; pub const VM_VFS_CACHE_PRESSURE: c_int = 26; diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 570ede87403a7..081b16d78ce39 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -3643,7 +3643,6 @@ pub const KERN_PROF: c_int = 6; pub const KERN_NODENAME: c_int = 7; pub const KERN_DOMAINNAME: c_int = 8; pub const KERN_PANIC: c_int = 15; -pub const KERN_REALROOTDEV: c_int = 16; pub const KERN_SPARC_REBOOT: c_int = 21; pub const KERN_CTLALTDEL: c_int = 22; pub const KERN_PRINTK: c_int = 23; @@ -3715,7 +3714,6 @@ pub const VM_SWAPPINESS: c_int = 19; pub const VM_LOWMEM_RESERVE_RATIO: c_int = 20; pub const VM_MIN_FREE_KBYTES: c_int = 21; pub const VM_MAX_MAP_COUNT: c_int = 22; -pub const VM_LAPTOP_MODE: c_int = 23; pub const VM_BLOCK_DUMP: c_int = 24; pub const VM_HUGETLB_GROUP: c_int = 25; pub const VM_VFS_CACHE_PRESSURE: c_int = 26;