Skip to content

Commit

Permalink
Merge pull request #438 from IATI/develop
Browse files Browse the repository at this point in the history
Merge develop into main for release
  • Loading branch information
James (ODSC) authored Oct 11, 2023
2 parents c43140b + 30d2e0a commit 6c278c0
Show file tree
Hide file tree
Showing 7 changed files with 946 additions and 740 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/develop_CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: ${{ needs.should_run.outputs.should_run == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
Expand Down Expand Up @@ -60,10 +60,10 @@ jobs:
needs: deploy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
wait-on: 'https://dev-validator.iatistandard.org'
config-file: cypress.config.dev.js
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/develop_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
name: 'Build and CI'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
build: npm run build:development
start: npm run serve
Expand All @@ -34,6 +34,6 @@ jobs:
pull-requests: write
contents: write
steps:
- uses: fastify/github-action-merge-dependabot@v3.8.0
- uses: fastify/github-action-merge-dependabot@v3.9.1
with:
github-token: ${{secrets.GITHUB_TOKEN}}
6 changes: 3 additions & 3 deletions .github/workflows/main_CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/[email protected]
Expand Down Expand Up @@ -43,10 +43,10 @@ jobs:
needs: deploy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
wait-on: 'https://validator.iatistandard.org'
config-file: cypress.config.prod.js
4 changes: 2 additions & 2 deletions .github/workflows/main_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
name: "Build and CI"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cypress CI Run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
build: npm run build:production
start: npm run serve
Expand Down
Loading

0 comments on commit 6c278c0

Please sign in to comment.