From 3a22018eddb5140021fc6c6952f87fb3240f4cd7 Mon Sep 17 00:00:00 2001
From: Dylan Hurd <dylan.hurd@openai.com>
Date: Tue, 4 Nov 2025 11:56:40 -0800
Subject: [PATCH] Revert "fix: pin musl 1.2.5 for DNS fixes" (#6222)

Reverts openai/codex#6189
---
 .github/actions/setup-musl-1_2_5/action.yml | 47 ---------------------
 .github/workflows/rust-ci.yml               | 12 ++++--
 .github/workflows/rust-release.yml          |  8 ++--
 3 files changed, 12 insertions(+), 55 deletions(-)
 delete mode 100644 .github/actions/setup-musl-1_2_5/action.yml

diff --git a/.github/actions/setup-musl-1_2_5/action.yml b/.github/actions/setup-musl-1_2_5/action.yml
deleted file mode 100644
index 64d43204..00000000
--- a/.github/actions/setup-musl-1_2_5/action.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Setup musl 1.2.5 toolchain
-description: Install musl 1.2.5 from source and configure the linker for the requested target.
-inputs:
-  target:
-    description: Cargo target triple that requires musl (e.g., x86_64-unknown-linux-musl).
-    required: true
-runs:
-  using: composite
-  steps:
-    - name: Install musl 1.2.5
-      shell: bash
-      env:
-        MUSL_VERSION: 1.2.5
-        MUSL_PREFIX: /opt/musl-1.2.5
-        DEBIAN_FRONTEND: noninteractive
-      run: |
-        set -euo pipefail
-        sudo apt-get -y update -o Acquire::Retries=3
-        sudo apt-get -y install --no-install-recommends build-essential curl pkg-config
-
-        curl -sSfL --retry 3 --retry-delay 1 "https://musl.libc.org/releases/musl-${MUSL_VERSION}.tar.gz" -o /tmp/musl.tar.gz
-        tar -xf /tmp/musl.tar.gz -C /tmp
-
-        pushd "/tmp/musl-${MUSL_VERSION}"
-        ./configure --prefix="${MUSL_PREFIX}"
-        make -j"$(nproc)"
-        sudo make install
-        popd
-
-        echo "${MUSL_PREFIX}/bin" >> "$GITHUB_PATH"
-        musl_gcc="${MUSL_PREFIX}/bin/musl-gcc"
-        "${musl_gcc}" --version
-
-        case "${{ inputs.target }}" in
-          x86_64-unknown-linux-musl)
-            echo "CC_x86_64_unknown_linux_musl=${musl_gcc}" >> "$GITHUB_ENV"
-            echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=${musl_gcc}" >> "$GITHUB_ENV"
-            ;;
-          aarch64-unknown-linux-musl)
-            echo "CC_aarch64_unknown_linux_musl=${musl_gcc}" >> "$GITHUB_ENV"
-            echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=${musl_gcc}" >> "$GITHUB_ENV"
-            ;;
-          *)
-            echo "Unsupported musl target '${{ inputs.target }}'" >&2
-            exit 1
-            ;;
-        esac
diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml
index 6bc7574d..103e8cf6 100644
--- a/.github/workflows/rust-ci.yml
+++ b/.github/workflows/rust-ci.yml
@@ -217,10 +217,14 @@ jobs:
           key: apt-${{ matrix.runner }}-${{ matrix.target }}-v1
 
       - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
-        name: Setup musl 1.2.5 toolchain
-        uses: ./.github/actions/setup-musl-1_2_5
-        with:
-          target: ${{ matrix.target }}
+        name: Install musl build tools
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        shell: bash
+        run: |
+          set -euo pipefail
+          sudo apt-get -y update -o Acquire::Retries=3
+          sudo apt-get -y install --no-install-recommends musl-tools pkg-config
 
       - name: Install cargo-chef
         if: ${{ matrix.profile == 'release' }}
diff --git a/.github/workflows/rust-release.yml b/.github/workflows/rust-release.yml
index f58c84bd..26afdaf5 100644
--- a/.github/workflows/rust-release.yml
+++ b/.github/workflows/rust-release.yml
@@ -92,10 +92,10 @@ jobs:
           key: cargo-${{ matrix.runner }}-${{ matrix.target }}-release-${{ hashFiles('**/Cargo.lock') }}
 
       - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
-        name: Setup musl 1.2.5 toolchain
-        uses: ./.github/actions/setup-musl-1_2_5
-        with:
-          target: ${{ matrix.target }}
+        name: Install musl build tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y musl-tools pkg-config
 
       - name: Cargo build
         run: cargo build --target ${{ matrix.target }} --release --bin codex --bin codex-responses-api-proxy