Skip to content

Commit 8328e03

Browse files
Revert "fix: pin musl 1.2.5 for DNS fixes" (openai#6222)
Reverts openai#6189
1 parent a3651a1 commit 8328e03

File tree

3 files changed

+12
-55
lines changed

3 files changed

+12
-55
lines changed

.github/actions/setup-musl-1_2_5/action.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/workflows/rust-ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,14 @@ jobs:
217217
key: apt-${{ matrix.runner }}-${{ matrix.target }}-v1
218218

219219
- if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
220-
name: Setup musl 1.2.5 toolchain
221-
uses: ./.github/actions/setup-musl-1_2_5
222-
with:
223-
target: ${{ matrix.target }}
220+
name: Install musl build tools
221+
env:
222+
DEBIAN_FRONTEND: noninteractive
223+
shell: bash
224+
run: |
225+
set -euo pipefail
226+
sudo apt-get -y update -o Acquire::Retries=3
227+
sudo apt-get -y install --no-install-recommends musl-tools pkg-config
224228
225229
- name: Install cargo-chef
226230
if: ${{ matrix.profile == 'release' }}

.github/workflows/rust-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ jobs:
9292
key: cargo-${{ matrix.runner }}-${{ matrix.target }}-release-${{ hashFiles('**/Cargo.lock') }}
9393

9494
- if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
95-
name: Setup musl 1.2.5 toolchain
96-
uses: ./.github/actions/setup-musl-1_2_5
97-
with:
98-
target: ${{ matrix.target }}
95+
name: Install musl build tools
96+
run: |
97+
sudo apt-get update
98+
sudo apt-get install -y musl-tools pkg-config
9999
100100
- name: Cargo build
101101
run: cargo build --target ${{ matrix.target }} --release --bin codex --bin codex-responses-api-proxy

0 commit comments

Comments
 (0)