Skip to content

Commit 3e48e4b

Browse files
tgross35tgross35
committed
ci: Use ./ with shebangs rather than sh or bash
The scripts say how they should execute, there isn't any reason to duplicate this wherever they are called. (backport <#4124>) (cherry picked from commit 4707c5d)
1 parent 92597e6 commit 3e48e4b

File tree

29 files changed

+43
-39
lines changed

29 files changed

+43
-39
lines changed

‎.github/workflows/ci.yaml

+21-17
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@ env:
1010
CARGO_TERM_VERBOSE: true
1111
LIBC_CI: 1
1212

13+
defaults:
14+
run:
15+
shell: bash
16+
1317
jobs:
1418
style_check:
1519
name: Style check
1620
runs-on: ubuntu-22.04
1721
steps:
1822
- uses: actions/checkout@v4
1923
- name: Setup Rust toolchain
20-
run: sh ./ci/install-rust.sh
24+
run: ./ci/install-rust.sh
2125
- name: Check style
22-
run: sh ci/style.sh
26+
run: ./ci/style.sh
2327

2428
build_channels_linux:
2529
name: Build Channels Linux
@@ -38,9 +42,9 @@ jobs:
3842
steps:
3943
- uses: actions/checkout@v4
4044
- name: Setup Rust toolchain
41-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
45+
run: TOOLCHAIN=${{ matrix.toolchain }} ./ci/install-rust.sh
4246
- name: Execute build.sh
43-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
47+
run: TOOLCHAIN=${{ matrix.toolchain }} ./ci/build.sh
4448

4549
build_channels_macos:
4650
name: Build Channels macOS
@@ -60,9 +64,9 @@ jobs:
6064
steps:
6165
- uses: actions/checkout@v4
6266
- name: Setup Rust toolchain
63-
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
67+
run: TOOLCHAIN=${{ matrix.target.toolchain }} ./ci/install-rust.sh
6468
- name: Execute build.sh
65-
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
69+
run: TOOLCHAIN=${{ matrix.target.toolchain }} ./ci/build.sh
6670

6771
build_channels_windows:
6872
name: Build Channels Windows
@@ -81,7 +85,7 @@ jobs:
8185
run: rustup self update
8286
shell: bash
8387
- name: Execute build.sh
84-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
88+
run: TOOLCHAIN=${{ matrix.toolchain }} ./ci/build.sh
8589
shell: bash
8690

8791
macos:
@@ -95,9 +99,9 @@ jobs:
9599
steps:
96100
- uses: actions/checkout@v4
97101
- name: Setup Rust toolchain
98-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
102+
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
99103
- name: Execute run.sh
100-
run: sh ./ci/run.sh ${{ matrix.target }}
104+
run: ./ci/run.sh ${{ matrix.target }}
101105

102106
windows:
103107
name: Windows
@@ -125,10 +129,10 @@ jobs:
125129
run: rustup self update
126130
shell: bash
127131
- name: Setup Rust toolchain
128-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
132+
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
129133
shell: bash
130134
- name: Execute run.sh
131-
run: sh ./ci/run.sh ${{ matrix.target }}
135+
run: ./ci/run.sh ${{ matrix.target }}
132136
shell: bash
133137

134138
docker_linux_tier1:
@@ -143,9 +147,9 @@ jobs:
143147
steps:
144148
- uses: actions/checkout@v4
145149
- name: Setup Rust toolchain
146-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
150+
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
147151
- name: Execute run-docker.sh
148-
run: sh ./ci/run-docker.sh ${{ matrix.target }}
152+
run: ./ci/run-docker.sh ${{ matrix.target }}
149153

150154
docker_linux_tier2:
151155
name: Docker Linux Tier2
@@ -185,9 +189,9 @@ jobs:
185189
steps:
186190
- uses: actions/checkout@v4
187191
- name: Setup Rust toolchain
188-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
192+
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
189193
- name: Execute run-docker.sh
190-
run: sh ./ci/run-docker.sh ${{ matrix.target }}
194+
run: ./ci/run-docker.sh ${{ matrix.target }}
191195

192196
solaris:
193197
name: Solaris
@@ -214,15 +218,15 @@ jobs:
214218
uname -a
215219
run: |
216220
export PATH=$HOME/.rust_solaris/bin:$PATH
217-
bash ./ci/run.sh ${{ matrix.target }}
221+
./ci/run.sh ${{ matrix.target }}
218222
219223
check_cfg:
220224
name: "Check #[cfg]s"
221225
runs-on: ubuntu-22.04
222226
steps:
223227
- uses: actions/checkout@v4
224228
- name: Setup Rust toolchain
225-
run: TOOLCHAIN=nightly sh ./ci/install-rust.sh
229+
run: TOOLCHAIN=nightly ./ci/install-rust.sh
226230
- name: Build with check-cfg
227231
run: LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
228232

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ We have two automated tests running on
9393
- `cd libc-test && cargo test`
9494
- Use the `skip_*()` functions in `build.rs` if you really need a workaround.
9595
2. Style checker
96-
- [`sh ci/style.sh`](https://github.com/rust-lang/libc/blob/main/ci/style.sh)
96+
- [`./ci/style.sh`](https://github.com/rust-lang/libc/blob/main/ci/style.sh)
9797

9898
## Breaking change policy
9999

‎ci/android-install-ndk.sh

100644100755
File mode changed.

‎ci/android-install-sdk.sh

100644100755
File mode changed.

‎ci/android-sysimage.sh

100644100755
File mode changed.

‎ci/build.sh

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ esac
201201
for target in $targets; do
202202
if echo "$target" | grep -q "$filter"; then
203203
if [ "${OS}" = "windows" ]; then
204-
TARGET="$target" sh ./ci/install-rust.sh
204+
TARGET="$target" ./ci/install-rust.sh
205205
test_target build "$target"
206206
else
207207
test_target build "$target"

‎ci/docker/aarch64-linux-android/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ COPY android* /android/
2020
ENV ANDROID_ARCH=aarch64
2121
ENV PATH=$PATH:/android/linux-x86_64/bin:/android/sdk/cmdline-tools/tools:/android/sdk/platform-tools
2222

23-
RUN sh /android/android-install-ndk.sh
24-
RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
23+
RUN /android/android-install-ndk.sh
24+
RUN /android/android-install-sdk.sh $ANDROID_ARCH
2525
RUN mv /root/.android /tmp
2626
RUN chmod 777 -R /tmp/.android
2727
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*

‎ci/docker/aarch64-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
55
gcc-aarch64-linux-gnu qemu-user
66

77
COPY install-musl.sh /
8-
RUN sh /install-musl.sh aarch64
8+
RUN /install-musl.sh aarch64
99

1010
# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
1111
ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \

‎ci/docker/arm-linux-androideabi/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ COPY android* /android/
2020
ENV ANDROID_ARCH=arm
2121
ENV PATH=$PATH:/android/linux-x86_64/bin:/android/sdk/cmdline-tools/tools:/android/sdk/platform-tools
2222

23-
RUN sh /android/android-install-ndk.sh
24-
RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
23+
RUN /android/android-install-ndk.sh
24+
RUN /android/android-install-sdk.sh $ANDROID_ARCH
2525
RUN mv /root/.android /tmp
2626
RUN chmod 777 -R /tmp/.android
2727
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*

‎ci/docker/arm-unknown-linux-musleabihf/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
88
gcc-arm-linux-gnueabihf qemu-user
99

1010
COPY install-musl.sh /
11-
RUN sh /install-musl.sh arm
11+
RUN /install-musl.sh arm
1212

1313
ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
1414
CC_arm_unknown_linux_musleabihf=musl-gcc \

‎ci/docker/asmjs-unknown-emscripten/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get install -y --no-install-recommends \
1818
bzip2
1919

2020
COPY emscripten.sh /
21-
RUN bash /emscripten.sh
21+
RUN /emscripten.sh
2222

2323
ENV PATH=$PATH:/rust/bin \
2424
CARGO_TARGET_ASMJS_UNKNOWN_EMSCRIPTEN_RUNNER=node

‎ci/docker/i686-linux-android/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ COPY android* /android/
2020
ENV ANDROID_ARCH=i686
2121
ENV PATH=$PATH:/android/linux-x86_64/bin:/android/sdk/cmdline-tools/tools:/android/sdk/platform-tools
2222

23-
RUN sh /android/android-install-ndk.sh
24-
RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
23+
RUN /android/android-install-ndk.sh
24+
RUN /android/android-install-sdk.sh $ANDROID_ARCH
2525
RUN mv /root/.android /tmp
2626
RUN chmod 777 -R /tmp/.android
2727
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*

‎ci/docker/i686-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
99
gcc-multilib make libc6-dev git curl ca-certificates libc6-i386
1010

1111
COPY install-musl.sh /
12-
RUN sh /install-musl.sh i686
12+
RUN /install-musl.sh i686
1313

1414
ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
1515
CC_i686_unknown_linux_musl=musl-gcc \

‎ci/docker/loongarch64-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc git libc6-dev make qemu-user xz-utils
55

66
COPY install-musl-cross.sh /
7-
RUN sh /install-musl-cross.sh loongarch64-unknown-linux-musl
7+
RUN /install-musl-cross.sh loongarch64-unknown-linux-musl
88

99
ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=loongarch64-unknown-linux-musl-gcc \
1010
CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-loongarch64" \

‎ci/docker/s390x-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
88
cpio
99

1010
COPY linux-s390x.sh /
11-
RUN bash /linux-s390x.sh
11+
RUN /linux-s390x.sh
1212

1313
COPY test-runner-linux /
1414

‎ci/docker/s390x-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
77
qemu-user
88

99
COPY install-musl.sh /
10-
RUN sh /install-musl.sh s390x
10+
RUN /install-musl.sh s390x
1111

1212
# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
1313
ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \

‎ci/docker/sparc64-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
p7zip-full cpio linux-libc-dev-sparc64-cross
1616

1717
COPY linux-sparc64.sh /
18-
RUN bash /linux-sparc64.sh
18+
RUN /linux-sparc64.sh
1919

2020
COPY test-runner-linux /
2121

‎ci/docker/wasm32-unknown-emscripten/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get install -y --no-install-recommends \
2626
RUN ln -s /usr/bin/python3 /usr/bin/python & \
2727
ln -s /usr/bin/pip3 /usr/bin/pip
2828
COPY emscripten.sh /
29-
RUN bash /emscripten.sh
29+
RUN /emscripten.sh
3030

3131
ENV PATH=$PATH:/rust/bin \
3232
CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node-wrapper.sh

‎ci/docker/wasm32-wasip1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:24.10
22

33
COPY wasi.sh /
4-
RUN bash /wasi.sh
4+
RUN /wasi.sh
55

66
# Note that `-D_WASI_EMULATED_PROCESS_CLOCKS` is used to enable access to
77
# clock-related defines even though they're emulated. Also note that the usage

‎ci/docker/wasm32-wasip2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:24.10
22

33
COPY wasi.sh /
4-
RUN bash /wasi.sh
4+
RUN /wasi.sh
55

66
# Note that most of these are copied from `wasm32-wasip1/Dockerfile`
77
#

‎ci/docker/x86_64-linux-android/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ RUN apt-get update && \
1212
WORKDIR /android/
1313
ENV ANDROID_ARCH=x86_64
1414
COPY android-install-ndk.sh /android/
15-
RUN sh /android/android-install-ndk.sh
15+
RUN /android/android-install-ndk.sh
1616

1717
# We do not run x86_64-linux-android tests on an android emulator.
1818
# See ci/android-sysimage.sh for information about how tests are run.
1919
COPY android-sysimage.sh /android/
20-
RUN bash /android/android-sysimage.sh x86_64 x86_64-24_r07.zip
20+
RUN /android/android-sysimage.sh x86_64 x86_64-24_r07.zip
2121

2222
ENV PATH=$PATH:/rust/bin:/android/linux-x86_64/bin \
2323
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android28-clang \

‎ci/docker/x86_64-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN apt-get install -y --no-install-recommends \
55
gcc make libc6-dev git curl ca-certificates
66

77
COPY install-musl.sh /
8-
RUN sh /install-musl.sh x86_64
8+
RUN /install-musl.sh x86_64
99

1010
ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin \
1111
RUSTFLAGS="-L /musl-x86_64/lib"

‎ci/emscripten.sh

100644100755
File mode changed.

‎ci/install-musl-cross.sh

100644100755
File mode changed.

‎ci/install-musl.sh

100644100755
File mode changed.

‎ci/install-rust.sh

100644100755
File mode changed.

‎ci/linux-s390x.sh

100644100755
File mode changed.

‎ci/linux-sparc64.sh

100644100755
File mode changed.

‎ci/wasi.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)