From 1aa302b7ec3c2bca00813803191ebb0ed183397c Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Tue, 12 Mar 2024 12:01:50 +0100 Subject: [PATCH 1/3] chore: use latest alpha for testing --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f482c82d0..fc07605ea 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "999.9.9-outlier-table.alpha.4", + "@dhis2/analytics": "999.99.9-outlier-and-te.alpha.1", "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", diff --git a/yarn.lock b/yarn.lock index c03951959..d0f4751fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2245,10 +2245,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@999.9.9-outlier-table.alpha.4": - version "999.9.9-outlier-table.alpha.4" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-999.9.9-outlier-table.alpha.4.tgz#a5ca4dc5cc8d1e819d9462c69a1d12149b9351c7" - integrity sha512-JtvJxqRQSEDoo2+Jq+bo0NIb2gq0hqCQfCpnTpET08uwkYFAwu6YKma2Z0rmK3A9IM0wwqSJNx3a7Cje7Px9BQ== +"@dhis2/analytics@999.99.9-outlier-and-te.alpha.1": + version "999.99.9-outlier-and-te.alpha.1" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-999.99.9-outlier-and-te.alpha.1.tgz#0da88a32c3540aaaa8de01942219b2abebd4c89f" + integrity sha512-Hn/Gp2iuYzZOkTfyBJXK+r+am78+A/Fkq0QiHXpJai5pgGA07ze6tv2jouPCWKnfXSKStZgTLt1QvvJ9DkojAQ== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" From e5b4dd764190fc9cf3cb2a939e89d284b06cc631 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Wed, 13 Mar 2024 11:04:22 +0100 Subject: [PATCH 2/3] chore: update analytics dependency --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fc07605ea..884232396 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "999.99.9-outlier-and-te.alpha.1", + "@dhis2/analytics": "^26.6.0", "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", diff --git a/yarn.lock b/yarn.lock index d0f4751fb..782de9e17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2245,10 +2245,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@999.99.9-outlier-and-te.alpha.1": - version "999.99.9-outlier-and-te.alpha.1" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-999.99.9-outlier-and-te.alpha.1.tgz#0da88a32c3540aaaa8de01942219b2abebd4c89f" - integrity sha512-Hn/Gp2iuYzZOkTfyBJXK+r+am78+A/Fkq0QiHXpJai5pgGA07ze6tv2jouPCWKnfXSKStZgTLt1QvvJ9DkojAQ== +"@dhis2/analytics@^26.6.0": + version "26.6.0" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.0.tgz#1d70463fca8a4d5f5838928e9ab6c5c07873715f" + integrity sha512-fO8ozVfnTulXQptPcT3W/y+Ru6sN/Qjhr6dWHL4LsG2siL1v8QOWKcnM/yScClJtRZvsbEnQ6vX47c7ujRsGUA== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" From cda7ce57bd7417c84dfb5c9d51f3724c4c5fd7fc Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Wed, 13 Mar 2024 14:02:05 +0100 Subject: [PATCH 3/3] test: use 41 test instance --- .github/workflows/dhis2-verify-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index 5e9cf8e63..84741d1e0 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -114,8 +114,8 @@ jobs: 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 }}