IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 7767-fix-maintenance-dockerfile-image-name

Browse Source
This commit is contained in:
mahula 2024-08-30 12:51:55 +02:00 committed by GitHub
commit ed92edb61b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/test-backend.yml vendored
View File

@ -112,16 +112,16 @@ jobs:
cp backend/.env.template backend/.env cp backend/.env.template backend/.env
- name: backend | docker-compose - 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 - 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 - 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 - name: backend | Unit test incl. coverage check
run: docker-compose exec -T backend yarn test run: docker compose exec -T backend yarn test
cleanup: cleanup:
name: Cleanup name: Cleanup

2
.github/workflows/test-e2e.yml vendored
View File

@ -77,7 +77,7 @@ jobs:
docker load < /tmp/images/neo4j.tar docker load < /tmp/images/neo4j.tar
docker load < /tmp/images/backend.tar docker load < /tmp/images/backend.tar
docker load < /tmp/images/webapp.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 sleep 90s
- name: Full stack tests | run tests - name: Full stack tests | run tests

4
.github/workflows/test-webapp.yml vendored
View File

@ -94,10 +94,10 @@ jobs:
cp backend/.env.template backend/.env cp backend/.env.template backend/.env
- name: backend | docker-compose - 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 - name: webapp | Unit tests incl. coverage check
run: docker-compose exec -T webapp yarn test run: docker compose exec -T webapp yarn test
cleanup: cleanup:
name: Cleanup name: Cleanup

8
backend/src/schema/resolvers/posts.spec.ts
View File

@ -632,8 +632,8 @@ describe('CreatePost', () => {
eventLocationName: 'Leipzig', eventLocationName: 'Leipzig',
eventVenue: 'Connewitzer Kreuz', eventVenue: 'Connewitzer Kreuz',
eventLocation: { eventLocation: {
lng: 12.374733, lng: 12.375101,
lat: 51.340632, lat: 51.34083,
}, },
}, },
}, },
@ -947,8 +947,8 @@ describe('UpdatePost', () => {
eventLocationName: 'Leipzig', eventLocationName: 'Leipzig',
eventVenue: 'Connewitzer Kreuz', eventVenue: 'Connewitzer Kreuz',
eventLocation: { eventLocation: {
lng: 12.374733, lng: 12.375101,
lat: 51.340632, lat: 51.34083,
}, },
}, },
}, },

4
backend/src/schema/resolvers/users/location.spec.ts
View File

@ -38,8 +38,8 @@ const newlyCreatedNodesWithLocales = [
nameRU: 'Вельцхайм', nameRU: 'Вельцхайм',
nameNL: 'Welzheim', nameNL: 'Welzheim',
namePL: 'Welzheim', namePL: 'Welzheim',
lng: 9.634741, lng: 9.634519,
lat: 48.874924, lat: 48.87682,
}, },
state: { state: {
id: expect.stringContaining('region'), id: expect.stringContaining('region'),

4
frontend/.github/workflows/frontend.deploy.docs.yml vendored
View File

@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@master uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7
- name: vuepress-deploy - name: vuepress-deploy
uses: jenkey2011/vuepress-deploy@master uses: jenkey2011/vuepress-deploy@875651a25c97353b9dcfc78c0c59b7dc09b8dbda # v1.8.1
env: env:
ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#TARGET_REPO: username/repo #TARGET_REPO: username/repo