Run cargo-update and use ubuntu-22.04

Signed-off-by: Charalampos Mitrodimas <charalampos@wasmer.io>

Author: charmitro

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
   workflow_call:
 jobs:
   build-libc:
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-22.04
     steps:
       - name: show git config
         run: |
@@ -17,10 +17,10 @@ jobs:
           ls -lha ./wasix-libc || true
 
       - name: Check out wasix-libc
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: wasix-org/wasix-libc
-          ref: main
+          ref: wasm64-rust-toolchain
           path: wasix-libc
           submodules: "recursive"
 
@@ -33,10 +33,10 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Check out cargo-wasix
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: wasix-org/cargo-wasix
-          ref: main
+          ref: target-fix
           path: cargo-wasix
           fetch-depth: 2
 
@@ -57,7 +57,7 @@ jobs:
           touch $GITHUB_WORKSPACE/.stub
 
       - name: Archive build output
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wasix-libc
           path: |
@@ -71,36 +71,30 @@ jobs:
       matrix:
         include:
           - name: Windows (x86)
-            os: windows-latest-8-cores
+            os: windows-latest
             arch: x86
 
           - name: Ubuntu (x86)
-            os: ubuntu-latest-8-cores
+            os: ubuntu-22.04
             arch: x86
 
           - name: Mac (x86)
-            os: macos-12-large
+            os: macos-13
             arch: x86
 
           - name: Mac (aarch64)
-            os: macos-13-xlarge
+            os: macos-15
             arch: aarch64
 
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        if: ${{ !contains(matrix.os, 'windows') }}
-        with:
-          toolchain: stable
-
       - name: Download wasix-libc artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wasix-libc
 
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: wasix-rust
           submodules: "recursive"
@@ -121,44 +115,12 @@ jobs:
       #   uses: dtolnay/rust-toolchain@stable
 
       - name: Check out cargo-wasix
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: wasix-org/cargo-wasix
-          ref: main
+          ref: target-fix
           path: cargo-wasix
 
-      # Linux!
-
-      - name: Setup (Ubuntu)
-        if: matrix.arch == 'x86' && contains(matrix.os, 'ubuntu')
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential curl wget xz-utils git python3 ninja-build cmake
-
-      - name: Build (Linux)
-        if: matrix.arch == 'x86' && contains(matrix.os, 'ubuntu')
-        shell: bash
-        env:
-          WASIX_NO_UPDATE_REPOS: "1"
-          WASIX_COMPONENTS: rust
-          WASIX_RUST_HOST: x86_64-unknown-linux-gnu
-        run: |
-          cd cargo-wasix
-          # NOTE: must unset GITHUB_ACTIONS env var, because Rst bootstrap checks for it.
-          # (see bootstrap config.rs)
-          GITHUB_ACTIONS=false WASIX_BUILD_DIR=$GITHUB_WORKSPACE cargo run -- wasix build-toolchain
-
-      - name: Archive build output (Linux)
-        uses: actions/upload-artifact@v3
-        if: contains(matrix.os, 'ubuntu')
-        with:
-          name: rust-toolchain-x86_64-unknown-linux-gnu
-          path: |
-            wasix-rust/build/x86_64-unknown-linux-gnu/stage2
-            !wasix-rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/src
-            !wasix-rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/rustc-src
-
       # Mac - x86
 
       - name: Setup (Mac OS)
@@ -169,9 +131,22 @@ jobs:
           # Need ninja for building llvm (for aarch64 cross compile)
           brew install ninja
 
+      # Interlude: install rust now. For some reason, brew install removes cargo, so
+      # we're doing this after as it keeps mac builds happy. This is ultimately a
+      # hack, so if anybody knows why brew install removes cargo, please fix it and
+      # move this step back up to where it originally was.
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        if: ${{ !contains(matrix.os, 'windows') }}
+        with:
+          toolchain: stable
+
+      # Mac - continued
+
       - name: Build (Mac Os, x86)
         shell: bash
-        if: contains(matrix.os, 'macos-12') && matrix.arch == 'x86'
+        if: contains(matrix.os, 'macos-13') && matrix.arch == 'x86'
         env:
           WASIX_NO_UPDATE_REPOS: "1"
           GITHUB_ACTIONS: "false"
@@ -184,7 +159,7 @@ jobs:
           GITHUB_ACTIONS=false WASIX_BUILD_DIR=$GITHUB_WORKSPACE cargo run -- wasix build-toolchain
 
       - name: Archive build output (Mac OS - x86)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: contains(matrix.os, 'macos') && matrix.arch == 'x86'
         with:
           name: rust-toolchain-x86_64-apple-darwin
@@ -210,7 +185,7 @@ jobs:
           GITHUB_ACTIONS=false WASIX_BUILD_DIR=$GITHUB_WORKSPACE cargo run -- wasix build-toolchain
 
       - name: Archive build output (Mac OS - aarch64)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: contains(matrix.os, 'macos') && matrix.arch == 'aarch64'
         with:
           name: rust-toolchain-aarch64-apple-darwin
@@ -219,6 +194,38 @@ jobs:
             !wasix-rust/build/aarch64-apple-darwin/stage2/lib/rustlib/src
             !wasix-rust/build/aarch64-apple-darwin/stage2/lib/rustlib/rustc-src
 
+      # Linux!
+
+      - name: Setup (Ubuntu)
+        if: matrix.arch == 'x86' && contains(matrix.os, 'ubuntu')
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential curl wget xz-utils git python3 ninja-build cmake
+
+      - name: Build (Linux)
+        if: matrix.arch == 'x86' && contains(matrix.os, 'ubuntu')
+        shell: bash
+        env:
+          WASIX_NO_UPDATE_REPOS: "1"
+          WASIX_COMPONENTS: rust
+          WASIX_RUST_HOST: x86_64-unknown-linux-gnu
+        run: |
+          cd cargo-wasix
+          # NOTE: must unset GITHUB_ACTIONS env var, because Rst bootstrap checks for it.
+          # (see bootstrap config.rs)
+          GITHUB_ACTIONS=false WASIX_BUILD_DIR=$GITHUB_WORKSPACE cargo run -- wasix build-toolchain
+
+      - name: Archive build output (Linux)
+        uses: actions/upload-artifact@v4
+        if: contains(matrix.os, 'ubuntu')
+        with:
+          name: rust-toolchain-x86_64-unknown-linux-gnu
+          path: |
+            wasix-rust/build/x86_64-unknown-linux-gnu/stage2
+            !wasix-rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/src
+            !wasix-rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/rustc-src
+
       # Windows
 
       # - name: Install chocolatey deps (Windows)
@@ -258,11 +265,12 @@ jobs:
 
       - name: Archive build output (Windows)
         if: contains(matrix.os, 'windows') && matrix.arch == 'x86'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: rust-toolchain-x86_64-pc-windows-msvc
           # name: rust-toolchain-x86_64-pc-windows-gnu
           path: |
             wasix-rust/build/x86_64-pc-windows-msvc/stage2
             !wasix-rust/build/x86_64-pc-windows-msvc/stage2/lib/rustlib/src
             !wasix-rust/build/x86_64-pc-windows-msvc/stage2/lib/rustlib/rustc-src
+

.github/workflows/dependencies.yml

@@ -27,7 +27,7 @@ jobs:
   not-waiting-on-bors:
     if: github.repository_owner == 'rust-lang'
     name: skip if S-waiting-on-bors
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -47,7 +47,7 @@ jobs:
     if: github.repository_owner == 'rust-lang'
     name: update dependencies
     needs: not-waiting-on-bors
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
     if: github.repository_owner == 'rust-lang'
     name: amend PR
     needs: update
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
       pull-requests: write

.github/workflows/release.yml

@@ -10,12 +10,12 @@ jobs:
 
   release:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: artifacts
     - name: Compress artifacts

Cargo.lock

@@ -1966,8 +1966,7 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"
 [[package]]
 name = "libc"
 version = "0.2.164"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+source = "git+https://github.com/wasix-org/libc.git?branch=wasix-0.2.164#eb0350e60d4e62cdd97e672fc7b94dd5f4ce83f4"
 
 [[package]]
 name = "libdbus-sys"
@@ -6342,8 +6341,3 @@ dependencies = [
  "quote",
  "syn 2.0.87",
 ]
-
-[[patch.unused]]
-name = "libc"
-version = "0.2.155"
-source = "git+https://github.com/wasix-org/libc.git?branch=wasix-0.2.155#cbaadd9965b725ba984a371b817e559d9da36187"

Cargo.toml

@@ -95,4 +95,4 @@ codegen-units = 1
 # lto = true
 
 [patch.crates-io]
-libc = { git = "https://github.com/wasix-org/libc.git", branch = "wasix-0.2.155" }
+libc = { git = "https://github.com/wasix-org/libc.git", branch = "wasix-0.2.164" }

library/Cargo.lock

@@ -158,17 +158,17 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
-source = "git+https://github.com/wasix-org/libc.git?branch=wasix-0.2.155#cbaadd9965b725ba984a371b817e559d9da36187"
+version = "0.2.162"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 dependencies = [
  "rustc-std-workspace-core",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.162"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+version = "0.2.164"
+source = "git+https://github.com/wasix-org/libc.git?branch=wasix-0.2.164#eb0350e60d4e62cdd97e672fc7b94dd5f4ce83f4"
 dependencies = [
  "rustc-std-workspace-core",
 ]
@@ -342,7 +342,7 @@ dependencies = [
  "fortanix-sgx-abi",
  "hashbrown",
  "hermit-abi",
- "libc 0.2.155",
+ "libc 0.2.164",
  "miniz_oxide",
  "object",
  "panic_abort",

library/std/Cargo.toml

@@ -34,7 +34,7 @@ miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
 addr2line = { version = "0.22.0", optional = true, default-features = false }
 
 [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
-libc = { git = "https://github.com/wasix-org/libc.git", branch = "wasix-0.2.155", version = "0.2.155", default-features = false, features = ['rustc-dep-of-std'], public = true }
+libc = { git = "https://github.com/wasix-org/libc.git", branch = "wasix-0.2.164", version = "0.2.164", default-features = false, features = ['rustc-dep-of-std'], public = true }
 
 [target.'cfg(all(not(target_os = "aix"), not(all(windows, target_env = "msvc", not(target_vendor = "uwp")))))'.dependencies]
 object = { version = "0.36.0", default-features = false, optional = true, features = [