From 03b938a8e15419e73552b6819aafb3bb4712bb4b Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 11:47:17 +0200 Subject: [PATCH 01/22] feat(ci): add docker run localy to start the backend at the same place --- .github/workflows/integration-tests.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5a71488c3..341c19a84 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -7,11 +7,19 @@ jobs: - run: sudo apt-get install libgtk2.0-0 libgtk-3-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb - name: Checkout uses: actions/checkout@v1 + - name: Run Backend + uses: addnab/docker-run-action@v3 + with: + username: ${{ secrets.PAT }} + password: ${{ secrets.PAT }} + registry: ghcr.io + image: informatique-cdc/ebad/ebad:2.10.0 + options: -p 11006:11006 - name: Cypress run uses: cypress-io/github-action@v4 with: start: npm run start:coverage - wait-on: 'http://localhost:4200, https://ebad-demo.homefaya.fr/ebad/actuator/health' + wait-on: 'http://localhost:4200, http://localhost:11006/ebad/actuator/health' wait-on-timeout: 180 browser: chrome command-prefix: npx From 6228f9ca2db5da5f4a28965af7d567af54cc242e Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 11:50:59 +0200 Subject: [PATCH 02/22] feat(ci): change image backend name --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 341c19a84..628f6f588 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -13,7 +13,7 @@ jobs: username: ${{ secrets.PAT }} password: ${{ secrets.PAT }} registry: ghcr.io - image: informatique-cdc/ebad/ebad:2.10.0 + image: ghcr.io/informatique-cdc/ebad/ebad:2.10.0 options: -p 11006:11006 - name: Cypress run uses: cypress-io/github-action@v4 From 32058183c0d56e4882f25979f1d636c41d6a7313 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 11:58:01 +0200 Subject: [PATCH 03/22] feat(ci): change backend url --- proxy-cov.conf.json | 2 +- proxy.conf.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy-cov.conf.json b/proxy-cov.conf.json index e9aa89726..04dc9bedd 100644 --- a/proxy-cov.conf.json +++ b/proxy-cov.conf.json @@ -1,7 +1,7 @@ { "/ebad": { - "target": "https://ebad-demo.homefaya.fr", + "target": "http://localhost:11006", "secure": false, "changeOrigin": true } diff --git a/proxy.conf.json b/proxy.conf.json index e9aa89726..04dc9bedd 100644 --- a/proxy.conf.json +++ b/proxy.conf.json @@ -1,7 +1,7 @@ { "/ebad": { - "target": "https://ebad-demo.homefaya.fr", + "target": "http://localhost:11006", "secure": false, "changeOrigin": true } From dbe530321d0f8f4baf3303b7246af75a42cc4bdc Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 12:18:53 +0200 Subject: [PATCH 04/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 628f6f588..8c71dd513 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -7,19 +7,17 @@ jobs: - run: sudo apt-get install libgtk2.0-0 libgtk-3-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb - name: Checkout uses: actions/checkout@v1 - - name: Run Backend - uses: addnab/docker-run-action@v3 + - name: Login to Docker Github + uses: docker/login-action@v2 with: + registry: ghcr.io username: ${{ secrets.PAT }} password: ${{ secrets.PAT }} - registry: ghcr.io - image: ghcr.io/informatique-cdc/ebad/ebad:2.10.0 - options: -p 11006:11006 - name: Cypress run uses: cypress-io/github-action@v4 with: - start: npm run start:coverage - wait-on: 'http://localhost:4200, http://localhost:11006/ebad/actuator/health' + start: npm run start:coverage && docker run -p 11006:11006 ghcr.io/informatique-cdc/ebad/ebad:2.10.0 + wait-on: 'http://localhost:11006/ebad/actuator/health, http://localhost:4200' wait-on-timeout: 180 browser: chrome command-prefix: npx From def3f54ea7f9221f542ef443c7a2f299191b0814 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 12:23:00 +0200 Subject: [PATCH 05/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8c71dd513..84d82666a 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -11,8 +11,8 @@ jobs: uses: docker/login-action@v2 with: registry: ghcr.io - username: ${{ secrets.PAT }} - password: ${{ secrets.PAT }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Cypress run uses: cypress-io/github-action@v4 with: From 28a17fbe3ba7f3cace459ecc66e5e197cce30e4e Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 12:26:53 +0200 Subject: [PATCH 06/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 84d82666a..8f3bdf8a8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,7 +16,9 @@ jobs: - name: Cypress run uses: cypress-io/github-action@v4 with: - start: npm run start:coverage && docker run -p 11006:11006 ghcr.io/informatique-cdc/ebad/ebad:2.10.0 + start: | + npm run start:coverage + docker run -p 11006:11006 ghcr.io/informatique-cdc/ebad/ebad:2.10.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://localhost:4200' wait-on-timeout: 180 browser: chrome From 0c10eb6ef3ab12d0757e3458a2430f1b9b9b5edf Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 12:42:49 +0200 Subject: [PATCH 07/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8f3bdf8a8..9f66d34e7 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -19,8 +19,9 @@ jobs: start: | npm run start:coverage docker run -p 11006:11006 ghcr.io/informatique-cdc/ebad/ebad:2.10.0 - wait-on: 'http://localhost:11006/ebad/actuator/health, http://localhost:4200' - wait-on-timeout: 180 +# wait-on: 'http://localhost:11006/ebad/actuator/health, http://localhost:4200' + wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' +# wait-on-timeout: 180 browser: chrome command-prefix: npx install-command: npm ci --legacy-peer-deps From 1e8b57cbed065472386ed5989c89211fea407c72 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 12:47:34 +0200 Subject: [PATCH 08/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 9f66d34e7..5034bebc8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -19,9 +19,9 @@ jobs: start: | npm run start:coverage docker run -p 11006:11006 ghcr.io/informatique-cdc/ebad/ebad:2.10.0 -# wait-on: 'http://localhost:11006/ebad/actuator/health, http://localhost:4200' - wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' -# wait-on-timeout: 180 + wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' +# wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' + wait-on-timeout: 180 browser: chrome command-prefix: npx install-command: npm ci --legacy-peer-deps From 49d0322780165288e64887d153d9ad5208e91d9f Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 12:54:32 +0200 Subject: [PATCH 09/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5034bebc8..1662e9aba 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -25,6 +25,7 @@ jobs: browser: chrome command-prefix: npx install-command: npm ci --legacy-peer-deps + auto-cancel-after-failures: 1 - uses: actions/upload-artifact@v2 if: failure() with: From fc14e518afaa86b7385babba23f7f624b0d0370a Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 13:08:36 +0200 Subject: [PATCH 10/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 2 +- proxy-cov.conf.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 1662e9aba..f9d85fe33 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -18,7 +18,7 @@ jobs: with: start: | npm run start:coverage - docker run -p 11006:11006 ghcr.io/informatique-cdc/ebad/ebad:2.10.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=local,jwt ghcr.io/informatique-cdc/ebad/ebad:2.10.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 diff --git a/proxy-cov.conf.json b/proxy-cov.conf.json index 04dc9bedd..569b332ab 100644 --- a/proxy-cov.conf.json +++ b/proxy-cov.conf.json @@ -1,7 +1,7 @@ { "/ebad": { - "target": "http://localhost:11006", + "target": "http://127.0.0.1:11006", "secure": false, "changeOrigin": true } From 8c344372abfbc175fafe2ed708bdaf7f01b2fbe5 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 13:10:28 +0200 Subject: [PATCH 11/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index f9d85fe33..ce0926808 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -18,7 +18,7 @@ jobs: with: start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=local,jwt ghcr.io/informatique-cdc/ebad/ebad:2.10.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE="local,jwt" ghcr.io/informatique-cdc/ebad/ebad:2.10.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 824b850990aa8f3478148bd4d4d5e616a9d3bb05 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 13:13:02 +0200 Subject: [PATCH 12/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index ce0926808..773a5477b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -18,7 +18,7 @@ jobs: with: start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE="local,jwt" ghcr.io/informatique-cdc/ebad/ebad:2.10.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=local\,jwt ghcr.io/informatique-cdc/ebad/ebad:2.10.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 3f774cd641754336e5b18c061a3df875fc5f0d09 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 13:16:46 +0200 Subject: [PATCH 13/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 773a5477b..6696499a8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,9 +16,11 @@ jobs: - name: Cypress run uses: cypress-io/github-action@v4 with: + env: + SPRING_PROFILES_ACTIVE: "local,jwt" start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=local\,jwt ghcr.io/informatique-cdc/ebad/ebad:2.10.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=$SPRING_PROFILES_ACTIVE ghcr.io/informatique-cdc/ebad/ebad:2.10.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 5d2cbe615e8996cf99e47c7e0aaca5fced082538 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 13:21:30 +0200 Subject: [PATCH 14/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 6696499a8..021eebc94 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -15,9 +15,9 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Cypress run uses: cypress-io/github-action@v4 + env: + SPRING_PROFILES_ACTIVE: "local,jwt" with: - env: - SPRING_PROFILES_ACTIVE: "local,jwt" start: | npm run start:coverage docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=$SPRING_PROFILES_ACTIVE ghcr.io/informatique-cdc/ebad/ebad:2.10.0 From 2fc23de9733ce55ae5ce653b57d763fc6f53a7dd Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 18:04:52 +0200 Subject: [PATCH 15/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 021eebc94..47d5cb4bc 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,11 +16,11 @@ jobs: - name: Cypress run uses: cypress-io/github-action@v4 env: - SPRING_PROFILES_ACTIVE: "local,jwt" + SPRING_PROFILES_ACTIVE: "local,jwt,demo" with: start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=$SPRING_PROFILES_ACTIVE ghcr.io/informatique-cdc/ebad/ebad:2.10.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=$SPRING_PROFILES_ACTIVE ghcr.io/informatique-cdc/ebad/ebad:2.11.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 940374ab86ea4b1a03d109c7fdcb6f32d185ad15 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 18:58:03 +0200 Subject: [PATCH 16/22] feat(ci): change backend url --- cypress/fixtures/login.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/fixtures/login.json b/cypress/fixtures/login.json index e15b4585b..288aec5fc 100644 --- a/cypress/fixtures/login.json +++ b/cypress/fixtures/login.json @@ -1,8 +1,8 @@ { "admin": { - "login": "admin", + "login": "demo", "password": "password", - "firstname": "admin", - "lastname": "admin" + "firstname": "demo", + "lastname": "demo" } } From 8fdb1a3f989b2081a6c07cec81a7c30692a89c7e Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 19:20:49 +0200 Subject: [PATCH 17/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 47d5cb4bc..6e8a942ed 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: with: start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=$SPRING_PROFILES_ACTIVE ghcr.io/informatique-cdc/ebad/ebad:2.11.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} ghcr.io/informatique-cdc/ebad/ebad:2.11.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 383c2fd0bbfbc2f384b995825633f653718d5a4b Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 19:30:34 +0200 Subject: [PATCH 18/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 6e8a942ed..291fc7066 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: with: start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} ghcr.io/informatique-cdc/ebad/ebad:2.11.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=${{env.SPRING_PROFILES_ACTIVE}} ghcr.io/informatique-cdc/ebad/ebad:2.11.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 856c17fd59aee40712c45cfdfdd3d2d3a85f2eb0 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 20:10:26 +0200 Subject: [PATCH 19/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 291fc7066..c0b0f8b79 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: with: start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE=${{env.SPRING_PROFILES_ACTIVE}} ghcr.io/informatique-cdc/ebad/ebad:2.11.0 + docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE="local jwt demo" ghcr.io/informatique-cdc/ebad/ebad:2.11.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 411877a96e36d6a0adb9bfa53387da05368a3d00 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 20:15:18 +0200 Subject: [PATCH 20/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index c0b0f8b79..33ee3c675 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -13,6 +13,8 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Spring profile + run: echo "SPRING_PROFILES_ACTIVE=local,jwt,demo" > springprofil.env - name: Cypress run uses: cypress-io/github-action@v4 env: @@ -20,7 +22,7 @@ jobs: with: start: | npm run start:coverage - docker run -p 11006:11006 -e SPRING_PROFILES_ACTIVE="local jwt demo" ghcr.io/informatique-cdc/ebad/ebad:2.11.0 + docker run -p 11006:11006 --env-file springprofil.env ghcr.io/informatique-cdc/ebad/ebad:2.11.0 wait-on: 'http://localhost:11006/ebad/actuator/health, http://[::1]:4200' # wait-on: 'npx wait-on --timeout 60000 http://localhost:4200' wait-on-timeout: 180 From 68648ee636c7fe703c0dea3ef583d122a61945ad Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 20:40:31 +0200 Subject: [PATCH 21/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 33ee3c675..5a203bade 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -14,7 +14,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Spring profile - run: echo "SPRING_PROFILES_ACTIVE=local,jwt,demo" > springprofil.env + run: echo "SPRING_PROFILES_ACTIVE=local,jwt,demo\nSPRING_DATASOURCE_URL=jdbc:h2:~/ebad;MODE=PostgreSQL;MODE=PostgreSQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE" > springprofil.env - name: Cypress run uses: cypress-io/github-action@v4 env: From e1ec5716afda5c12602b0441cb21b23ec811cf63 Mon Sep 17 00:00:00 2001 From: Damien Trouillet Date: Mon, 8 May 2023 20:44:27 +0200 Subject: [PATCH 22/22] feat(ci): change backend url --- .github/workflows/integration-tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5a203bade..0bde72031 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -14,11 +14,9 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Spring profile - run: echo "SPRING_PROFILES_ACTIVE=local,jwt,demo\nSPRING_DATASOURCE_URL=jdbc:h2:~/ebad;MODE=PostgreSQL;MODE=PostgreSQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE" > springprofil.env + run: echo $'SPRING_PROFILES_ACTIVE=local,jwt,demo\nSPRING_DATASOURCE_URL=jdbc:h2:~/ebad;MODE=PostgreSQL;MODE=PostgreSQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE' > springprofil.env - name: Cypress run uses: cypress-io/github-action@v4 - env: - SPRING_PROFILES_ACTIVE: "local,jwt,demo" with: start: | npm run start:coverage