Skip to content

Commit

Permalink
HOFF-1059: Fix failing functional test in Github workflowflow
Browse files Browse the repository at this point in the history
- rollback ubuntu version from latest to 22.04 to fix failing workflow
- update node version to version 20
- update actions/checkout to version 4
- update actions/setup-node to version 4
- update yarn.lock
- amend and rename pr template so it will be generated automatically on pr creation
  • Loading branch information
Rhodine-orleans-lindsay committed Jan 9, 2025
1 parent 977f7bf commit 72b20a9
Show file tree
Hide file tree
Showing 5 changed files with 1,322 additions and 1,109 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/automate-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
- completed
jobs:
auto-publish:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: startsWith(github.ref, 'refs/heads/master')
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v1
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20
registry-url: https://registry.npmjs.org/
- name: 'Get Previous tag'
id: previoustag
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/automate-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ name: Automate_Tag
on: [push]
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [14.x]
node-version: [20.x]
redis-version: [4, 5, 6]
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Start Redis
Expand All @@ -25,16 +25,16 @@ jobs:

auto-tag-patch:
needs: test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: |
startsWith(github.ref, 'refs/heads/master') &&
!contains(github.event.head_commit.message, '[MAJOR]') &&
!contains(github.event.head_commit.message, '[MINOR]')
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20
registry-url: https://registry.npmjs.org/
- run: |
git config --local user.email "$(git log --format='%ae' HEAD^!)"
Expand All @@ -43,16 +43,16 @@ jobs:
auto-tag-minor:
needs: test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: |
startsWith(github.ref, 'refs/heads/master') &&
!contains(github.event.head_commit.message, '[MAJOR]') &&
contains(github.event.head_commit.message, '[MINOR]')
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20
registry-url: https://registry.npmjs.org/
- run: |
git config --local user.email "$(git log --format='%ae' HEAD^!)"
Expand All @@ -61,16 +61,16 @@ jobs:
auto-tag-major:
needs: test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: |
startsWith(github.ref, 'refs/heads/master') &&
contains(github.event.head_commit.message, '[MAJOR]') &&
!contains(github.event.head_commit.message, '[MINOR]')
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20
registry-url: https://registry.npmjs.org/
- run: |
git config --local user.email "$(git log --format='%ae' HEAD^!)"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hof",
"description": "A bootstrap for HOF projects",
"version": "21.1.1",
"version": "21.1.2",
"license": "MIT",
"main": "index.js",
"author": "HomeOffice",
Expand Down
2 changes: 1 addition & 1 deletion pull_request.md → pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
- [ ] I have created a JIRA number for my commit
- [ ] I have followed the chris beams method for my commit https://cbea.ms/git-commit/
here is an [example commit](https://github.com/UKHomeOfficeForms/hof/commit/810959f391187c7c4af6db262bcd143b50093a6e)
- [ ] Ensure drone builds are green especially tests
- [ ] Ensure workflow jobs are passing especially tests
- [ ] I will squash the commits before merging
Loading

0 comments on commit 72b20a9

Please sign in to comment.