Skip to content

Commit c9cbcae

Browse files
hasufellhasufell
committed
Mark CI scripts as bash
And remove ambiguous shebang.
1 parent ba7cccd commit c9cbcae

File tree

3 files changed

+16
-20
lines changed

3 files changed

+16
-20
lines changed

‎.github/scripts/build.sh‎ renamed to ‎.github/scripts/build.bash‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/bin/bash
2-
31
set -eux
42

53
uname -a

‎.github/scripts/test.sh‎ renamed to ‎.github/scripts/test.bash‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/bin/bash
2-
31
set -eux
42

53
env

‎.github/workflows/reusable-release.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175

176176
- name: Run build
177177
run: |
178-
bash .github/scripts/build.sh
178+
bash .github/scripts/build.bash
179179
180180
env:
181181
ARTIFACT: ${{ matrix.platform.ARTIFACT }}
@@ -215,7 +215,7 @@ jobs:
215215
- name: Run build (32 bit linux)
216216
uses: docker://i386/alpine:3.20
217217
with:
218-
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.sh"
218+
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.bash"
219219

220220
- if: always()
221221
name: Upload artifact
@@ -257,7 +257,7 @@ jobs:
257257
uses: docker://arm64v8/debian:11
258258
name: Run build (aarch64 linux)
259259
with:
260-
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.sh"
260+
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.bash"
261261
env:
262262
ARTIFACT: ${{ matrix.platform.ARTIFACT }}
263263
DISTRO: ${{ matrix.platform.DISTRO }}
@@ -267,7 +267,7 @@ jobs:
267267
uses: docker://arm64v8/alpine:3.20
268268
name: Run build (aarch64 linux alpine)
269269
with:
270-
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.sh"
270+
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.bash"
271271
env:
272272
ARTIFACT: ${{ matrix.platform.ARTIFACT }}
273273
DISTRO: ${{ matrix.platform.DISTRO }}
@@ -309,7 +309,7 @@ jobs:
309309

310310
- name: Run build
311311
run: |
312-
bash .github/scripts/build.sh
312+
bash .github/scripts/build.bash
313313
314314
- if: always()
315315
name: Upload artifact
@@ -349,7 +349,7 @@ jobs:
349349

350350
- name: Run build
351351
run: |
352-
bash .github/scripts/build.sh
352+
bash .github/scripts/build.bash
353353
354354
- if: always()
355355
name: Upload artifact
@@ -400,7 +400,7 @@ jobs:
400400
$env:CHERE_INVOKING = 1
401401
$env:MSYS2_PATH_TYPE = "inherit"
402402
$ErrorActionPreference = "Stop"
403-
C:\msys64\usr\bin\bash -lc "bash .github/scripts/build.sh"
403+
C:\msys64\usr\bin\bash -lc "bash .github/scripts/build.bash"
404404
shell: pwsh
405405

406406
- if: always()
@@ -445,7 +445,7 @@ jobs:
445445
sudo pkg install -y curl gcc gmp gmake ncurses perl5 pkgconf libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x
446446
sudo tzsetup Etc/GMT
447447
sudo adjkerntz -a
448-
bash .github/scripts/build.sh
448+
bash .github/scripts/build.bash
449449
450450
- if: always()
451451
name: Upload artifact
@@ -573,7 +573,7 @@ jobs:
573573

574574
- name: Run test
575575
run: |
576-
bash .github/scripts/test.sh
576+
bash .github/scripts/test.bash
577577
env:
578578
ARTIFACT: ${{ matrix.platform.ARTIFACT }}
579579
DISTRO: ${{ matrix.platform.DISTRO }}
@@ -608,7 +608,7 @@ jobs:
608608
# - name: Run build (32 bit linux)
609609
# uses: docker://i386/alpine:3.20
610610
# with:
611-
# args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} groff && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.sh"
611+
# args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools }} groff && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/build.bash"
612612

613613
test-arm:
614614
name: Test ARM binary
@@ -646,7 +646,7 @@ jobs:
646646
uses: docker://arm64v8/debian:11
647647
name: Run build (aarch64 linux)
648648
with:
649-
args: sh -c "apt-get update && apt-get install -y curl bash git groff-base ${{ needs.tool-output.outputs.apt_tools }} && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/test.sh"
649+
args: sh -c "apt-get update && apt-get install -y curl bash git groff-base ${{ needs.tool-output.outputs.apt_tools }} && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/test.bash"
650650
env:
651651
ARTIFACT: ${{ matrix.platform.ARTIFACT }}
652652
DISTRO: ${{ matrix.platform.DISTRO }}
@@ -655,7 +655,7 @@ jobs:
655655
uses: docker://arm64v8/alpine:3.20
656656
name: Run build (aarch64 linux alpine)
657657
with:
658-
args: sh -c "apk update && apk add curl bash git groff ${{ needs.tool-output.outputs.apk_tools }} && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/test.sh"
658+
args: sh -c "apk update && apk add curl bash git groff ${{ needs.tool-output.outputs.apk_tools }} && git config --system --add safe.directory $GITHUB_WORKSPACE && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup install cabal ${{ env.CABAL_VERSION }} && bash .github/scripts/test.bash"
659659
env:
660660
ARTIFACT: ${{ matrix.platform.ARTIFACT }}
661661
DISTRO: ${{ matrix.platform.DISTRO }}
@@ -693,7 +693,7 @@ jobs:
693693

694694
- name: Run test
695695
run: |
696-
bash .github/scripts/test.sh
696+
bash .github/scripts/test.bash
697697
698698
test-mac-aarch64:
699699
name: Test binary (Mac aarch64)
@@ -730,7 +730,7 @@ jobs:
730730

731731
- name: Run test
732732
run: |
733-
bash .github/scripts/test.sh
733+
bash .github/scripts/test.bash
734734
735735
test-win:
736736
name: Test binary (Win)
@@ -777,7 +777,7 @@ jobs:
777777
$env:CHERE_INVOKING = 1
778778
$env:MSYS2_PATH_TYPE = "inherit"
779779
$ErrorActionPreference = "Stop"
780-
C:\msys64\usr\bin\bash -lc "bash .github/scripts/test.sh"
780+
C:\msys64\usr\bin\bash -lc "bash .github/scripts/test.bash"
781781
shell: pwsh
782782

783783
test-freebsd-x86_64:
@@ -819,5 +819,5 @@ jobs:
819819
sudo pkg install -y curl gcc gmp gmake ncurses perl5 pkgconf libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x groff autoconf automake
820820
sudo tzsetup Etc/GMT
821821
sudo adjkerntz -a
822-
bash .github/scripts/test.sh
822+
bash .github/scripts/test.bash
823823

0 commit comments

Comments
 (0)