From ff4a33e4740b6473d090202cb134fabce0080d92 Mon Sep 17 00:00:00 2001
From: Damien <81557462+Damien-Chen@users.noreply.github.com>
Date: Wed, 6 Nov 2024 07:29:21 +0800
Subject: [PATCH 1/4] gh-122544: Change OS image in GitHub Actions to Ubuntu
 24.04 (#122566)

---
 .github/workflows/build.yml           |  9 ++--
 .github/workflows/reusable-tsan.yml   |  2 +-
 .github/workflows/reusable-ubuntu.yml |  2 +-
 .github/workflows/reusable-wasi.yml   | 77 +++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/reusable-wasi.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 325752ecde4967..39a4e278f0bdfc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -139,7 +139,7 @@ jobs:
     name: 'Check if generated files are up to date'
     # Don't use ubuntu-latest but a specific version to make the job
     # reproducible: to get the same tools versions (autoconf, aclocal, ...)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
@@ -290,7 +290,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -342,7 +342,7 @@ jobs:
 
   test_hypothesis:
     name: "Hypothesis tests on Ubuntu"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
@@ -459,6 +459,9 @@ jobs:
     timeout-minutes: 60
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    strategy:
+      matrix:
+        os: [ubuntu-24.04]
     env:
       OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
diff --git a/.github/workflows/reusable-tsan.yml b/.github/workflows/reusable-tsan.yml
index b20ba062d62d63..7b132f0ffdf8e1 100644
--- a/.github/workflows/reusable-tsan.yml
+++ b/.github/workflows/reusable-tsan.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build_tsan_reusable:
     name: 'Thread sanitizer'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index a5abec11555083..364d52a2e0a4b7 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
     env:
       OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
diff --git a/.github/workflows/reusable-wasi.yml b/.github/workflows/reusable-wasi.yml
new file mode 100644
index 00000000000000..85af793c342c51
--- /dev/null
+++ b/.github/workflows/reusable-wasi.yml
@@ -0,0 +1,77 @@
+name: Reusable WASI
+
+on:
+  workflow_call:
+    inputs:
+      config_hash:
+        required: true
+        type: string
+
+jobs:
+  build_wasi_reusable:
+    name: 'build and test'
+    timeout-minutes: 60
+    runs-on: ubuntu-24.04
+    env:
+      WASMTIME_VERSION: 22.0.0
+      WASI_SDK_VERSION: 24
+      WASI_SDK_PATH: /opt/wasi-sdk
+      CROSS_BUILD_PYTHON: cross-build/build
+      CROSS_BUILD_WASI: cross-build/wasm32-wasi
+    steps:
+    - uses: actions/checkout@v4
+    # No problem resolver registered as one doesn't currently exist for Clang.
+    - name: "Install wasmtime"
+      uses: bytecodealliance/actions/wasmtime/setup@v1
+      with:
+        version: ${{ env.WASMTIME_VERSION }}
+    - name: "Restore WASI SDK"
+      id: cache-wasi-sdk
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.WASI_SDK_PATH }}
+        key: ${{ runner.os }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}
+    - name: "Install WASI SDK"
+      if: steps.cache-wasi-sdk.outputs.cache-hit != 'true'
+      run: |
+        mkdir ${{ env.WASI_SDK_PATH }} && \
+        curl -s -S --location https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${{ env.WASI_SDK_VERSION }}/wasi-sdk-${{ env.WASI_SDK_VERSION }}.0-x86_64-linux.tar.gz | \
+        tar --strip-components 1 --directory ${{ env.WASI_SDK_PATH }} --extract --gunzip
+    - name: "Configure ccache action"
+      uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        save: ${{ github.event_name == 'push' }}
+        max-size: "200M"
+    - name: "Add ccache to PATH"
+      run: echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
+    - name: "Install Python"
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+    - name: "Restore Python build config.cache"
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.CROSS_BUILD_PYTHON }}/config.cache
+        # Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python.
+        # Include the hash of `Tools/wasm/wasi.py` as it may change the environment variables.
+        # (Make sure to keep the key in sync with the other config.cache step below.)
+        key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
+    - name: "Configure build Python"
+      run: python3 Tools/wasm/wasi.py configure-build-python -- --config-cache --with-pydebug
+    - name: "Make build Python"
+      run: python3 Tools/wasm/wasi.py make-build-python
+    - name: "Restore host config.cache"
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.CROSS_BUILD_WASI }}/config.cache
+        # Should be kept in sync with the other config.cache step above.
+        key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
+    - name: "Configure host"
+      # `--with-pydebug` inferred from configure-build-python
+      run: python3 Tools/wasm/wasi.py configure-host -- --config-cache
+    - name: "Make host"
+      run: python3 Tools/wasm/wasi.py make-host
+    - name: "Display build info"
+      run: make --directory ${{ env.CROSS_BUILD_WASI }} pythoninfo
+    - name: "Test"
+      run: make --directory ${{ env.CROSS_BUILD_WASI }} test

From fb52fc468e71c73237b71e7966f8d3c7cc62e9c2 Mon Sep 17 00:00:00 2001
From: Damien-Chen <inkfan130924783@gmail.com>
Date: Sat, 9 Nov 2024 22:02:11 +0800
Subject: [PATCH 2/4] remove wasi

---
 .github/workflows/reusable-wasi.yml | 77 -----------------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 .github/workflows/reusable-wasi.yml

diff --git a/.github/workflows/reusable-wasi.yml b/.github/workflows/reusable-wasi.yml
deleted file mode 100644
index 85af793c342c51..00000000000000
--- a/.github/workflows/reusable-wasi.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: Reusable WASI
-
-on:
-  workflow_call:
-    inputs:
-      config_hash:
-        required: true
-        type: string
-
-jobs:
-  build_wasi_reusable:
-    name: 'build and test'
-    timeout-minutes: 60
-    runs-on: ubuntu-24.04
-    env:
-      WASMTIME_VERSION: 22.0.0
-      WASI_SDK_VERSION: 24
-      WASI_SDK_PATH: /opt/wasi-sdk
-      CROSS_BUILD_PYTHON: cross-build/build
-      CROSS_BUILD_WASI: cross-build/wasm32-wasi
-    steps:
-    - uses: actions/checkout@v4
-    # No problem resolver registered as one doesn't currently exist for Clang.
-    - name: "Install wasmtime"
-      uses: bytecodealliance/actions/wasmtime/setup@v1
-      with:
-        version: ${{ env.WASMTIME_VERSION }}
-    - name: "Restore WASI SDK"
-      id: cache-wasi-sdk
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.WASI_SDK_PATH }}
-        key: ${{ runner.os }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}
-    - name: "Install WASI SDK"
-      if: steps.cache-wasi-sdk.outputs.cache-hit != 'true'
-      run: |
-        mkdir ${{ env.WASI_SDK_PATH }} && \
-        curl -s -S --location https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${{ env.WASI_SDK_VERSION }}/wasi-sdk-${{ env.WASI_SDK_VERSION }}.0-x86_64-linux.tar.gz | \
-        tar --strip-components 1 --directory ${{ env.WASI_SDK_PATH }} --extract --gunzip
-    - name: "Configure ccache action"
-      uses: hendrikmuhs/ccache-action@v1.2
-      with:
-        save: ${{ github.event_name == 'push' }}
-        max-size: "200M"
-    - name: "Add ccache to PATH"
-      run: echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
-    - name: "Install Python"
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
-    - name: "Restore Python build config.cache"
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CROSS_BUILD_PYTHON }}/config.cache
-        # Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python.
-        # Include the hash of `Tools/wasm/wasi.py` as it may change the environment variables.
-        # (Make sure to keep the key in sync with the other config.cache step below.)
-        key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
-    - name: "Configure build Python"
-      run: python3 Tools/wasm/wasi.py configure-build-python -- --config-cache --with-pydebug
-    - name: "Make build Python"
-      run: python3 Tools/wasm/wasi.py make-build-python
-    - name: "Restore host config.cache"
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CROSS_BUILD_WASI }}/config.cache
-        # Should be kept in sync with the other config.cache step above.
-        key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
-    - name: "Configure host"
-      # `--with-pydebug` inferred from configure-build-python
-      run: python3 Tools/wasm/wasi.py configure-host -- --config-cache
-    - name: "Make host"
-      run: python3 Tools/wasm/wasi.py make-host
-    - name: "Display build info"
-      run: make --directory ${{ env.CROSS_BUILD_WASI }} pythoninfo
-    - name: "Test"
-      run: make --directory ${{ env.CROSS_BUILD_WASI }} test

From bfc7fcc26ddce52a57442bc612a93062bb8aa78c Mon Sep 17 00:00:00 2001
From: Damien-Chen <inkfan130924783@gmail.com>
Date: Sat, 9 Nov 2024 22:42:16 +0800
Subject: [PATCH 3/4] Add lib for nis module in ubuntu-24.04

---
 .github/workflows/posix-deps-apt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/posix-deps-apt.sh b/.github/workflows/posix-deps-apt.sh
index bbae378f7b994e..2a5864eb490f61 100755
--- a/.github/workflows/posix-deps-apt.sh
+++ b/.github/workflows/posix-deps-apt.sh
@@ -19,6 +19,7 @@ apt-get -yq install \
     libreadline6-dev \
     libsqlite3-dev \
     libssl-dev \
+    libnsl-dev \
     lzma \
     lzma-dev \
     tk-dev \

From 7e9e4638e9e0ed9b277e7b386805c36e9fdd5fb3 Mon Sep 17 00:00:00 2001
From: Damien-Chen <inkfan130924783@gmail.com>
Date: Sun, 10 Nov 2024 02:23:58 +0800
Subject: [PATCH 4/4] Modify as reviewer suggest

---
 .github/workflows/posix-deps-apt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/posix-deps-apt.sh b/.github/workflows/posix-deps-apt.sh
index 2a5864eb490f61..a4679e118f9c1c 100755
--- a/.github/workflows/posix-deps-apt.sh
+++ b/.github/workflows/posix-deps-apt.sh
@@ -16,10 +16,10 @@ apt-get -yq install \
     libgdbm-compat-dev \
     liblzma-dev \
     libncurses5-dev \
+    libnsl-dev \
     libreadline6-dev \
     libsqlite3-dev \
     libssl-dev \
-    libnsl-dev \
     lzma \
     lzma-dev \
     tk-dev \