-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into design-changes
- Loading branch information
Showing
75 changed files
with
3,581 additions
and
2,443 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
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 |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ name: 'dhis2: verify (app)' | |
|
|
||
| on: | ||
| pull_request: | ||
| types: ['opened', 'edited', 'reopened', 'synchronize'] | ||
| types: ['opened', 'labeled', 'reopened', 'synchronize'] | ||
| push: | ||
| branches: | ||
| - 'master' | ||
|
|
@@ -19,6 +19,18 @@ env: | |
| CI: 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: | ||
|
|
@@ -77,12 +89,16 @@ jobs: | |
|
|
||
| e2e-prod: | ||
| runs-on: ubuntu-latest | ||
| needs: test | ||
| needs: [test, setup-matrix] | ||
| if: "!contains(github.event.head_commit.message, '[skip ci]')" | ||
|
|
||
| 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: | ||
| - uses: actions/checkout@v3 | ||
|
|
@@ -94,28 +110,46 @@ jobs: | |
| id: yarn-cache | ||
| with: | ||
| path: '**/node_modules' | ||
| key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
| key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }} | ||
|
|
||
| - 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 "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 || '' }}" | ||
| echo "Spec=${{ join(matrix.spec-group.tests, ',') }}" | ||
| - name: End-to-End tests | ||
| uses: cypress-io/github-action@v2 | ||
| with: | ||
| record: true | ||
| parallel: true | ||
| start: ${{ env.SERVER_START_CMD }} | ||
| wait-on: ${{ env.SERVER_URL }} | ||
| wait-on-timeout: 300 | ||
| cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
| group: 'e2e' | ||
| tag: ${{ github.event_name }} | ||
| cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }} | ||
| 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: | ||
| CI: true | ||
| CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} | ||
| COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }} | ||
| SERVER_START_CMD: 'yarn cypress:start' | ||
| SERVER_URL: 'http://localhost:3000' | ||
| cypress_dhis2_api_stub_mode: 'DISABLED' | ||
| REACT_APP_DHIS2_BASE_URL: ${{ secrets.CYPRESS_DHIS2_BASE_URL_40 }} | ||
| cypress_dhis2_base_url: ${{ secrets.CYPRESS_DHIS2_BASE_URL_40}} | ||
| REACT_APP_DHIS2_BASE_URL: ${{ secrets.CYPRESS_DHIS2_BASE_URL_41 }} | ||
| cypress_dhis2_base_url: ${{ secrets.CYPRESS_DHIS2_BASE_URL_41}} | ||
| cypress_dhis2_username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} | ||
| cypress_dhis2_password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
@@ -126,7 +160,7 @@ jobs: | |
| if: | | ||
| !github.event.push.repository.fork && | ||
| github.actor != 'dependabot[bot]' && | ||
| github.event_name != 'pull_request' | ||
| (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
|
|
@@ -163,11 +197,95 @@ jobs: | |
| !cancelled() && | ||
| github.ref == 'refs/heads/master' | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@master | ||
|
|
||
| - name: Extract version | ||
| id: extract_version | ||
| uses: Saionaro/[email protected] | ||
|
|
||
| - name: Send failure message to analytics-internal-bot slack channel | ||
| id: slack | ||
| uses: slackapi/[email protected] | ||
| with: | ||
| channel-id: ${{ secrets.SLACK_CHANNEL_ID }} | ||
| slack-message: ':small_red_triangle_down: :dashboard-app: Dashboard-app release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure>' | ||
| payload: | | ||
| { | ||
| "text": ":small_red_triangle_down: :dashboard-app: Dashboard version ${{ steps.extract_version.outputs.version }} release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>", | ||
| "blocks": [ | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": ":small_red_triangle_down: :dashboard-app: Dashboard version ${{ steps.extract_version.outputs.version }} release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| env: | ||
| SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} | ||
|
|
||
| report-release-success: | ||
| runs-on: ubuntu-latest | ||
| needs: release | ||
| if: | | ||
| success() && | ||
| !cancelled() && | ||
| github.ref == 'refs/heads/master' && | ||
| contains(github.event.head_commit.message, 'chore(release)') | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@master | ||
|
|
||
| - name: Extract version | ||
| id: extract_version | ||
| uses: Saionaro/[email protected] | ||
|
|
||
| - name: Send success message to analytics-internal-bot slack channel | ||
| id: slack | ||
| uses: slackapi/[email protected] | ||
| with: | ||
| channel-id: ${{ secrets.SLACK_CHANNEL_ID }} | ||
| payload: | | ||
| { | ||
| "text": "Dashboard app release ${{ steps.extract_version.outputs.version }} succeeded", | ||
| "blocks": [ | ||
| { | ||
| "type": "header", | ||
| "text": { | ||
| "type": "plain_text", | ||
| "text": ":large_green_circle: :dashboard-app: Dashboard version ${{ steps.extract_version.outputs.version }} released :tada:", | ||
| "emoji": true | ||
| } | ||
| }, | ||
| { | ||
| "type": "divider" | ||
| }, | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": "*Release Notes*" | ||
| } | ||
| }, | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": ${{ toJSON(github.event.head_commit.message) }} | ||
| } | ||
| }, | ||
| { | ||
| "type": "divider" | ||
| }, | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": "Link to <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Asuccess|build>" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| env: | ||
| SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} | ||
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
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.