Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): upgrade @dhis2/cli-app-scripts and @dhis2/ui #231

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

chore(deps): upgrade @dhis2/cli-app-scripts and @dhis2/ui #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abee8c5
chore: fix development mode for ARM64 architecture
HendrikThePendric Feb 8, 2023
fe8cb5c
chore: upgrade node version for github workflows
HendrikThePendric Feb 8, 2023
eba77f0
chore: fix failing tests
HendrikThePendric Feb 8, 2023
7c84d3e
chore: regenerate fixtures for latest 3 DHIS2 Core versions
HendrikThePendric Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dhis2-preview-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/dhis2-verify-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
Expand All @@ -51,7 +51,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
Expand All @@ -70,7 +70,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
Expand All @@ -83,7 +83,7 @@ jobs:
- name: Test
run: yarn d2-app-scripts test

e2e-v37:
e2e-v38:
runs-on: ubuntu-latest
if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"

Expand All @@ -98,7 +98,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- name: End-to-End tests
uses: cypress-io/github-action@v2
Expand All @@ -113,10 +113,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_dhis2BaseUrl: http://localhost:8082
CYPRESS_dhis2ApiVersion: 37
CYPRESS_dhis2ApiVersion: 38
CYPRESS_networkMode: stub

e2e-v38:
e2e-v39:
runs-on: ubuntu-latest
if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"

Expand All @@ -131,7 +131,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- name: End-to-End tests
uses: cypress-io/github-action@v2
Expand All @@ -146,10 +146,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_dhis2BaseUrl: http://localhost:8081
CYPRESS_dhis2ApiVersion: 38
CYPRESS_dhis2ApiVersion: 39
CYPRESS_networkMode: stub

e2e-v39:
e2e-v40:
runs-on: ubuntu-latest
if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"

Expand All @@ -164,7 +164,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- name: End-to-End tests
uses: cypress-io/github-action@v2
Expand All @@ -179,12 +179,12 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_dhis2BaseUrl: http://localhost:8080
CYPRESS_dhis2ApiVersion: 39
CYPRESS_dhis2ApiVersion: 40
CYPRESS_networkMode: stub

release:
runs-on: ubuntu-latest
needs: [build, lint, test, e2e-v37]
needs: [build, lint, test, e2e-v40, e2e-v39, e2e-v38]
if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
steps:
- uses: actions/checkout@v2
Expand All @@ -193,7 +193,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x

- uses: actions/download-artifact@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion cypress.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"env": {
"dhis2DataTestPrefix": "dhis2-approval",
"networkMode": "live",
"dhis2ApiVersion": "37"
"dhis2ApiVersion": "40"
},
"testFiles": "**/*.feature"
}
327 changes: 0 additions & 327 deletions cypress/fixtures/network/37/static_resources.json
View file
Open in desktop

This file was deleted.

1,478 changes: 0 additions & 1,478 deletions cypress/fixtures/network/37/users_can_approve,_accept,_unapprove,_and_unaccept_data.json
View file
Open in desktop

This file was deleted.

84 changes: 42 additions & 42 deletions cypress/fixtures/network/38/static_resources.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions cypress/fixtures/network/38/summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"count": 341,
"totalResponseSize": 111449,
"duplicates": 234,
"nonDeterministicResponses": 12,
"count": 364,
"totalResponseSize": 61545,
"duplicates": 251,
"nonDeterministicResponses": 19,
"apiVersion": 38,
"fixtureFiles": [
"static_resources.json",
Expand Down
531 changes: 309 additions & 222 deletions cypress/fixtures/network/38/users_can_approve,_accept,_unapprove,_and_unaccept_data.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading