From b01539c4c1f1236d4d463c2f18635818bc16472d Mon Sep 17 00:00:00 2001 From: mahula Date: Sat, 24 Aug 2024 14:54:18 +0200 Subject: [PATCH 1/3] replace docker-compose by docker compose in workflow files --- .github/workflows/test-backend.yml | 8 ++++---- .github/workflows/test-e2e.yml | 2 +- .github/workflows/test-webapp.yml | 4 ++-- frontend/.github/workflows/frontend.deploy.docs.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index 1574b7cee..0690cbc50 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -112,16 +112,16 @@ jobs: cp backend/.env.template backend/.env - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend - name: backend | Initialize Database - run: docker-compose exec -T backend yarn db:migrate init + run: docker compose exec -T backend yarn db:migrate init - name: backend | Migrate Database Up - run: docker-compose exec -T backend yarn db:migrate up + run: docker compose exec -T backend yarn db:migrate up - name: backend | Unit test incl. coverage check - run: docker-compose exec -T backend yarn test + run: docker compose exec -T backend yarn test cleanup: name: Cleanup diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index fabb2a3f1..ad29c76d4 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -77,7 +77,7 @@ jobs: docker load < /tmp/images/neo4j.tar docker load < /tmp/images/backend.tar docker load < /tmp/images/webapp.tar - docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend + docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend sleep 90s - name: Full stack tests | run tests diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml index 2a6593994..e148663a8 100644 --- a/.github/workflows/test-webapp.yml +++ b/.github/workflows/test-webapp.yml @@ -94,10 +94,10 @@ jobs: cp backend/.env.template backend/.env - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp - name: webapp | Unit tests incl. coverage check - run: docker-compose exec -T webapp yarn test + run: docker compose exec -T webapp yarn test cleanup: name: Cleanup diff --git a/frontend/.github/workflows/frontend.deploy.docs.yml b/frontend/.github/workflows/frontend.deploy.docs.yml index 957e80aba..5041eee14 100644 --- a/frontend/.github/workflows/frontend.deploy.docs.yml +++ b/frontend/.github/workflows/frontend.deploy.docs.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7 - name: vuepress-deploy - uses: jenkey2011/vuepress-deploy@master + uses: jenkey2011/vuepress-deploy@875651a25c97353b9dcfc78c0c59b7dc09b8dbda # v1.8.1 env: ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} #TARGET_REPO: username/repo From 27777eedaab93a427df4fcd27254aca501ead27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 29 Aug 2024 13:42:40 +0200 Subject: [PATCH 2/3] Fix backend tests 'valid event input with location name' --- backend/src/schema/resolvers/posts.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/schema/resolvers/posts.spec.ts b/backend/src/schema/resolvers/posts.spec.ts index b816e25aa..10da1c43e 100644 --- a/backend/src/schema/resolvers/posts.spec.ts +++ b/backend/src/schema/resolvers/posts.spec.ts @@ -632,8 +632,8 @@ describe('CreatePost', () => { eventLocationName: 'Leipzig', eventVenue: 'Connewitzer Kreuz', eventLocation: { - lng: 12.374733, - lat: 51.340632, + lng: 12.375101, + lat: 51.34083, }, }, }, @@ -947,8 +947,8 @@ describe('UpdatePost', () => { eventLocationName: 'Leipzig', eventVenue: 'Connewitzer Kreuz', eventLocation: { - lng: 12.374733, - lat: 51.340632, + lng: 12.375101, + lat: 51.34083, }, }, }, From 0691b8eb79605a0f06f9e91c055b663cbcfe34da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 29 Aug 2024 13:48:21 +0200 Subject: [PATCH 3/3] Fix backend test which uses 'newlyCreatedNodesWithLocales' in file 'backend/src/schema/resolvers/users/location.spec.ts' --- backend/src/schema/resolvers/users/location.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/schema/resolvers/users/location.spec.ts b/backend/src/schema/resolvers/users/location.spec.ts index de132c2c7..d4db00b7b 100644 --- a/backend/src/schema/resolvers/users/location.spec.ts +++ b/backend/src/schema/resolvers/users/location.spec.ts @@ -38,8 +38,8 @@ const newlyCreatedNodesWithLocales = [ nameRU: 'Вельцхайм', nameNL: 'Welzheim', namePL: 'Welzheim', - lng: 9.634741, - lat: 48.874924, + lng: 9.634519, + lat: 48.87682, }, state: { id: expect.stringContaining('region'),