Skip to content

Commit

Permalink
Use sh rather than bash for CI script
Browse files Browse the repository at this point in the history
So we can run test-gem-install on both regular and Alpine Ruby images,
use a sh script rather than relying on bash.
  • Loading branch information
mudge committed Dec 16, 2024
1 parent 6b789ee commit 0428540
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ jobs:
docker run --rm -v "$(pwd):/argon2id" -w /argon2id \
--platform=linux/arm64 \
ruby:${{ matrix.ruby }}-alpine \
sh -c "gem update --system && apk add bash && ./scripts/test-gem-install"
./scripts/test-gem-install
test-precompiled-arm-linux-gnu:
needs: "precompile-arm-linux-gnu"
Expand All @@ -246,7 +246,7 @@ jobs:
docker run --rm -v "$(pwd):/argon2id" -w /argon2id \
--platform=linux/arm/v7 \
ruby:${{ matrix.ruby }} \
sh -c "gem update --system && ./scripts/test-gem-install"
./scripts/test-gem-install
test-precompiled-arm-linux-musl:
needs: "precompile-arm-linux-musl"
Expand All @@ -267,7 +267,7 @@ jobs:
docker run --rm -v "$(pwd):/argon2id" -w /argon2id \
--platform=linux/arm/v7 \
ruby:${{ matrix.ruby }}-alpine \
sh -c "gem update --system && apk add bash && ./scripts/test-gem-install"
./scripts/test-gem-install
test-precompiled-x86-linux-gnu:
needs: "precompile-x86-linux-gnu"
Expand Down Expand Up @@ -309,7 +309,7 @@ jobs:
docker run --rm -v "$(pwd):/argon2id" -w /argon2id \
--platform=linux/386 \
ruby:${{ matrix.ruby }}-alpine \
sh -c "gem update --system && apk add bash && ./scripts/test-gem-install"
./scripts/test-gem-install
test-precompiled-x86_64-linux-gnu:
needs: "precompile-x86_64-linux-gnu"
Expand Down Expand Up @@ -347,7 +347,6 @@ jobs:
with:
name: cruby-x86_64-linux-musl-gem
path: pkg
- run: apk add bash
- run: ./scripts/test-gem-install

test-precompiled-arm64-darwin:
Expand Down
4 changes: 2 additions & 2 deletions scripts/test-gem-install
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

set -eu

gem install --no-document pkg/*.gem -- "$@"
gem install --no-document pkg/*.gem
cd "$(dirname "$(gem which argon2id)")/.."
bundle
bundle exec rake test

0 comments on commit 0428540

Please sign in to comment.