-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:dhis2/ui into LIBS-567/modal-acce…
…ssibility-translation
- Loading branch information
Showing
510 changed files
with
5,764 additions
and
3,919 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "nonGlobalStepDefinitions": true, | ||
| "e2e": { | ||
| "stepDefinitions": [ | ||
| "[filepath]/*.{js,mjs,ts,tsx}", | ||
| "[filepath]/../common/index.{js,mjs,ts,tsx}", | ||
| "cypress/e2e/common.js" | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,12 +26,12 @@ jobs: | |
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 14.x | ||
| node-version: 20.x | ||
|
|
||
| - uses: c-hive/gha-yarn-cache@v1 | ||
| - run: yarn install --frozen-lockfile | ||
|
|
||
| - run: yarn build | ||
| - run: yarn build:legacy | ||
|
|
||
| - uses: nwtgck/[email protected] | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,50 @@ | ||
| name: 'dhis2: verify (lib)' | ||
|
|
||
| on: push | ||
| on: | ||
| push: | ||
| pull_request: | ||
| types: [labeled] | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow}}-${{ github.ref }} | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
|
|
||
| env: | ||
| GIT_AUTHOR_NAME: '@dhis2-bot' | ||
| GIT_AUTHOR_EMAIL: '[email protected]' | ||
| GIT_COMMITTER_NAME: '@dhis2-bot' | ||
| GIT_COMMITTER_EMAIL: '[email protected]' | ||
| NPM_TOKEN: ${{secrets.DHIS2_BOT_NPM_TOKEN}} | ||
| GH_TOKEN: ${{secrets.DHIS2_BOT_GITHUB_TOKEN}} | ||
| NPM_TOKEN: ${{ secrets.DHIS2_BOT_NPM_TOKEN }} | ||
| GH_TOKEN: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }} | ||
| D2_VERBOSE: true | ||
|
|
||
| jobs: | ||
| setup-matrix: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| matrix: ${{ steps.set-matrix.outputs.specs }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Generate test matrix | ||
| id: set-matrix | ||
| run: | | ||
| node cypress/support/generateTestMatrix.js > matrix.json | ||
| echo "::set-output name=specs::$(cat matrix.json)" | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 14.x | ||
| node-version: 20.x | ||
|
|
||
| - uses: c-hive/gha-yarn-cache@v1 | ||
| - run: | | ||
| yarn install --frozen-lockfile | ||
| yarn setup | ||
| NODE_OPTIONS=--openssl-legacy-provider yarn setup | ||
| - name: Build | ||
| run: yarn build | ||
| run: yarn build:legacy | ||
|
|
||
| - run: ./scripts/create-artifact.sh | ||
|
|
||
|
|
@@ -46,7 +61,7 @@ jobs: | |
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 14.x | ||
| node-version: 20.x | ||
|
|
||
| - uses: actions/download-artifact@v2 | ||
| with: | ||
|
|
@@ -67,7 +82,7 @@ jobs: | |
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 14.x | ||
| node-version: 20.x | ||
|
|
||
| - uses: actions/download-artifact@v2 | ||
| with: | ||
|
|
@@ -84,20 +99,22 @@ jobs: | |
| e2e: | ||
| runs-on: ubuntu-latest | ||
| if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'" | ||
| needs: [build] | ||
| needs: [build, setup-matrix] | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| containers: [1, 2, 3, 4] | ||
| spec-group: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} | ||
| env: | ||
| SHOULD_RECORD: ${{ contains(github.event.head_commit.message, '[e2e record]') || contains(join(github.event.pull_request.labels.*.name), 'e2e record') }} | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 14.x | ||
| node-version: 20.x | ||
|
|
||
| - uses: actions/download-artifact@v2 | ||
| with: | ||
|
|
@@ -108,17 +125,37 @@ jobs: | |
| - name: Increase FS watchers | ||
| run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p | ||
|
|
||
| - name: Set Cypress Record Environment Variables | ||
| if: env.SHOULD_RECORD == 'true' | ||
| run: | | ||
| echo "CYPRESS_GROUP=e2e-${{ matrix.spec-group.id }}" >> $GITHUB_ENV | ||
| echo "CYPRESS_TAG=${{ github.event_name }}" >> $GITHUB_ENV | ||
| echo "CYPRESS_CI_BUILD_ID=${{ github.run_id }}" >> $GITHUB_ENV | ||
| - name: Debug Environment Variables | ||
| run: | | ||
| echo "SHOULD_RECORD=${{ env.SHOULD_RECORD }}" | ||
| echo "CI Build ID=${{ github.run_id }}" | ||
| echo "Group ID=e2e-${{ matrix.spec-group.id }}" | ||
| echo "Spec=${{ join(matrix.spec-group.tests, ',') }}" | ||
| echo "Record=${{ env.SHOULD_RECORD }}" | ||
| echo "Parallel=${{ env.SHOULD_RECORD }}" | ||
| echo "Computed Group=${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_GROUP || '' }}" | ||
| echo "Computed Tag=${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_TAG || '' }}" | ||
| echo "Computed CI Build ID=${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_CI_BUILD_ID || '' }}" | ||
| - name: End-to-End tests | ||
| uses: cypress-io/github-action@v2 | ||
| uses: cypress-io/github-action@v6 | ||
| with: | ||
| # This should be a command that starts the server to test against. | ||
| start: 'yarn cy:start' | ||
| start: 'yarn cy:start:legacy' | ||
| wait-on: 'http://localhost:5000' | ||
| wait-on-timeout: 300 | ||
| record: true | ||
| parallel: true | ||
| group: 'e2e' | ||
| tag: ${{ github.event_name }} | ||
| record: ${{ env.SHOULD_RECORD }} | ||
| parallel: ${{ env.SHOULD_RECORD }} | ||
| group: ${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_GROUP || '' }} | ||
| tag: ${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_TAG || '' }} | ||
| ci-build-id: ${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_CI_BUILD_ID || '' }} | ||
| spec: ${{ join(matrix.spec-group.tests, ',') }} | ||
| env: | ||
| BROWSER: none | ||
| COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }} | ||
|
|
@@ -133,10 +170,10 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| token: ${{env.GH_TOKEN}} | ||
| token: ${{ env.GH_TOKEN }} | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 14.x | ||
| node-version: 20.x | ||
| cache: 'yarn' | ||
|
|
||
| - uses: actions/download-artifact@v2 | ||
|
|
@@ -148,6 +185,9 @@ jobs: | |
| # ensure that d2-app-scripts is available | ||
| - run: yarn install --frozen-lockfile | ||
|
|
||
| # FIXME: Add legacy npm to allow our broken peerdeps for now. | ||
| # This should be addressed properly by fixing our peerdeps. | ||
| - run: npm i -g npm@6 | ||
| - uses: dhis2/action-semantic-release@master | ||
| with: | ||
| publish-npm: true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,7 @@ bundle.stats.json | |
|
|
||
| # cypress | ||
| cypress/screenshots | ||
| cypress/downloads | ||
| cypress/videos | ||
| cypress.env.json | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v16 | ||
| v20 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.