Skip to content

Commit

Permalink
Merge branch 'main' of github.com:nationalarchives/tna-frontend into …
Browse files Browse the repository at this point in the history
…fix/cookie-banner-params
  • Loading branch information
ahosgood committed Oct 27, 2023
2 parents 7434b1c + 9f859dd commit b77a758
Show file tree
Hide file tree
Showing 24 changed files with 1,125 additions and 1,493 deletions.
18 changes: 0 additions & 18 deletions .github/actions/test-build/action.yml

This file was deleted.

File renamed without changes.
3 changes: 3 additions & 0 deletions .github/actions/tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ runs:
- name: Start Storybook
run: npm start &
shell: bash
- name: Install Platwright
run: npx playwright install
shell: bash
- uses: nev7n/wait_for_response@v1
with:
url: "http://localhost:6006"
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:

jobs:
check:
name: Pre-release checks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -55,41 +54,30 @@ jobs:
- name: Tests
uses: ./.github/actions/tests

test-build:
runs-on: ubuntu-latest
needs:
- check
steps:
- uses: actions/checkout@v3
- name: Test build Storybook
uses: ./.github/actions/test-build

test-build-package:
test-package:
runs-on: ubuntu-latest
needs:
- check
steps:
- uses: actions/checkout@v3
- name: Test build package
uses: ./.github/actions/test-build-package
uses: ./.github/actions/test-package

prototype-kit:
runs-on: ubuntu-latest
needs:
- test-build-package
- test-package
steps:
- uses: actions/checkout@v3
- name: GOV.UK prototype kit test
uses: ./.github/actions/prototype-kit-test

publish-npm:
name: Build package and publish to npm
runs-on: ubuntu-latest
needs:
- check
- lint
- tests
- test-build
- prototype-kit
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ concurrency:

jobs:
github-pages:
name: Build and deploy to GitHub Pages
runs-on: ubuntu-latest
environment:
name: github-pages
Expand All @@ -51,7 +50,6 @@ jobs:
uses: actions/deploy-pages@v2

chromatic:
name: Build and deploy to Chromatic
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ concurrency:

jobs:
chromatic:
name: Upload to Chromatic
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,17 @@ jobs:
- name: Tests
uses: ./.github/actions/tests

test-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Test build Storybook
uses: ./.github/actions/test-build

test-build-package:
test-package:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Test build package
uses: ./.github/actions/test-build-package
uses: ./.github/actions/test-package

prototype-kit:
runs-on: ubuntu-latest
needs:
- test-build-package
- test-package
steps:
- uses: actions/checkout@v3
- name: GOV.UK prototype kit test
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/hydrogen
lts/iron
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Tweak spacing on hero component and `<hr>` elements
- Added `tna-button-group` around newsletter subscription button in the footer
- Updated Storybook to `7.5.1`
- Changed Node version from `lts/hydrogen` to `lts/iron`

### Removed

Expand Down
Loading

0 comments on commit b77a758

Please sign in to comment.