Skip to content

Commit

Permalink
Merge branch 'main' into add-answer-source-order-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuyuutsu authored Jul 10, 2024
2 parents 3f9b8d0 + 0c34202 commit 966c748
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
docker-push:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build
run: |
docker build -t onsdigital/eq-questionnaire-validator:latest .
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
lint:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: |
echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "npm"
Expand All @@ -33,7 +33,7 @@ jobs:
virtualenvs-path: ~/.virtualenvs

- name: Cache Poetry virtualenv
uses: actions/cache@v3
uses: actions/cache@v4
id: cache-virtualenv
with:
path: ~/.virtualenvs
Expand All @@ -47,13 +47,13 @@ jobs:
test-unit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run:
echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "npm"
Expand All @@ -73,7 +73,7 @@ jobs:
virtualenvs-path: ~/.virtualenvs

- name: Cache Poetry virtualenv
uses: actions/cache@v3
uses: actions/cache@v4
id: cache-virtualenv
with:
path: ~/.virtualenvs
Expand All @@ -87,7 +87,7 @@ jobs:
docker-push:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Tag
run: |
CLEAN_TAG=$(echo "${{ github.event.pull_request.head.ref }}" | tr / -)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
env:
TAG: ${{ github.event.release.tag_name }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build
run: |
docker build -t onsdigital/eq-questionnaire-validator:$TAG .
Expand Down

0 comments on commit 966c748

Please sign in to comment.