Skip to content

Commit

Permalink
Merge pull request #188 from LeastAuthority/177.pin-github-runner
Browse files Browse the repository at this point in the history
Pin GitHub runner in integration workflow too
  • Loading branch information
btlogy authored Feb 5, 2024
2 parents 916d748 + fd7ecac commit 2e9aebf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
sudo adduser runner runner
echo "_GID=$(grep -E "^runner:" /etc/group | cut -d: -f3)" >> $GITHUB_ENV
- name: Build image - if not cached
- name: Build image
run: |
repository=${{ github.repository }}
# Verify the cache
Expand All @@ -74,6 +74,3 @@ jobs:
- name: Deploy package
run: docker compose run --no-deps client npm run deploy

- name: Stop containers
run: docker compose down
6 changes: 3 additions & 3 deletions .github/workflows/integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
sudo adduser runner runner
echo "_GID=$(grep -E "^runner:" /etc/group | cut -d: -f3)" >> $GITHUB_ENV
- name: Build images - if not cached
- name: Build images
run: |
repository=${{ github.repository }}
# Verify the cache
Expand All @@ -91,7 +91,7 @@ jobs:
docker compose --progress plain -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e \
build --build-arg uid=$(id -u) --build-arg gid=${_GID}
- name: Setup containers
- name: Prepare containers
run: |
docker compose run --rm --no-deps -e CI=true client npm clean-install
docker compose run --rm --no-deps client ./scripts/setup.sh
Expand Down
2 changes: 1 addition & 1 deletion client-e2e/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine
FROM node:16-alpine3.18@sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787

# Parameters for default user:group
ARG uid=1000
Expand Down

0 comments on commit 2e9aebf

Please sign in to comment.