From edcfe3eeae2c2b5969ae8661f17a0a3faa4ee09a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 16:13:02 +0100 Subject: [PATCH 1/2] chore(deps): bump @dhis2/d2-i18n from 1.1.1 to 1.1.3 (#3056) Bumps [@dhis2/d2-i18n](https://github.com/dhis2/d2-i18n) from 1.1.1 to 1.1.3. - [Release notes](https://github.com/dhis2/d2-i18n/releases) - [Changelog](https://github.com/dhis2/d2-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/d2-i18n/compare/v1.1.1...v1.1.3) --- updated-dependencies: - dependency-name: "@dhis2/d2-i18n" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d5f1ff205..434ddf0e5 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-alerts": "^3.9.4", "@dhis2/app-service-datastore": "^1.0.0-beta.3", - "@dhis2/d2-i18n": "^1.1.1", + "@dhis2/d2-i18n": "^1.1.3", "@dhis2/maps-gl": "^3.8.6", "@dhis2/ui": "^8.16.0", "@krakenjs/post-robot": "^11.0.0", diff --git a/yarn.lock b/yarn.lock index 23d87bf60..3192699f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2224,11 +2224,12 @@ resolved "https://registry.yarnpkg.com/@dhis2/cypress-plugins/-/cypress-plugins-10.0.3.tgz#83403aca333e2b356f7ea92c272d3ca00d00276d" integrity sha512-MYIkWI/kCR4hoqvD+spmbXcdoNL/EFX3HZuyRCGUErj5ChJmyWX7jQtDq/twd7GFRma0IqwTtOwaiKAxLRv/Nw== -"@dhis2/d2-i18n@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.1.tgz#acaca32cd00b60fd6b6f1dee571f2817a50e243c" - integrity sha512-X0jOCIKPaYv/2z0/sdkEvcbRiYu5o1FrOwvitiS6aKFxSL/GJ872I+UdHwpWJtL+yM7Z8E1epljazW0LnHUz0Q== +"@dhis2/d2-i18n@^1.1.1", "@dhis2/d2-i18n@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.3.tgz#ad73030f7cfceeed1b5bcaad86a9b336130bdfb1" + integrity sha512-vOu6RDNumOJM396mHt35bETk9ai9b6XJyAwlUy1HstUZNvfET61F8rjCmMuXZU6zJ8ELux8kMFqlH8IG0vDJmA== dependencies: + "@types/i18next" "^11.9.0" i18next "^10.3" moment "^2.24.0" @@ -3513,6 +3514,11 @@ dependencies: "@types/node" "*" +"@types/i18next@^11.9.0": + version "11.9.3" + resolved "https://registry.yarnpkg.com/@types/i18next/-/i18next-11.9.3.tgz#04d84c6539908ad69665d26d8967f942d1638550" + integrity sha512-snM7bMKy6gt7UYdpjsxycqSCAy0fr2JVPY0B8tJ2vp9bN58cE7C880k20PWFM4KXxQ3KsstKM8DLCawGCIH0tg== + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" From 03eed2d6fd3f697686183743ba30b079eb175f62 Mon Sep 17 00:00:00 2001 From: Adel Bensaad Date: Wed, 20 Dec 2023 16:16:16 +0100 Subject: [PATCH 2/2] fix: conditionally set PR title in dhis2-verify-app workflow (#3089) * fix: conditionally set PR title in dhis2-verify-app workflow * fix: conditionally set PR title in dhis2-verify-app workflow --- .github/workflows/dhis2-verify-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index d5a0d2598..d802dab9a 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -78,7 +78,7 @@ jobs: REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }} CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - PR_TITLE: ${{ github.event.pull_request.title }} + PR_TITLE: ${{ github.event_name == 'pull_request' && github.event.pull_request.title || format('Direct push to {0}', github.ref_name) }} call-workflow-e2e-prod: if: "!contains(github.event.head_commit.message, '[skip ci]')"