iritmaximus/oodikone
1
0
Fork 0
mirror of https://github.com/UniversityOfHelsinkiCS/oodikone.git synced 2026-10-12 19:03:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace docker-compose with docker compose in GHA workflow files

Browse Source
This commit is contained in:
Valtteri Kantanen
2024-04-03 16:22:28 +03:00
parent 5a4d37556c
commit a4d2d43a18
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/actions/run-tests/action.yaml
+2 -2
View File
@@ -24,7 +24,7 @@ runs:
- name: 'Run services, pull rest of the needed images' - name: 'Run services, pull rest of the needed images'
shell: bash shell: bash
run: docker-compose --file docker-compose.ci.yml up --detach run: docker compose --file docker-compose.ci.yml up --detach
- name: 'Run cypress' - name: 'Run cypress'
uses: cypress-io/github-action@v6 uses: cypress-io/github-action@v6
@@ -44,4 +44,4 @@ runs:
- name: 'Print logs on failure' - name: 'Print logs on failure'
shell: bash shell: bash
if: failure() if: failure()
run: docker-compose --file docker-compose.ci.yml logs run: docker compose --file docker-compose.ci.yml logs
.github/workflows/test.yaml
+5 -5
View File
@@ -70,7 +70,7 @@ jobs:
- name: 'Let sis-updater-worker run migrations, then push new version of image to toska hub' - name: 'Let sis-updater-worker run migrations, then push new version of image to toska hub'
if: steps.check_migrations.outputs.migrations == 'true' if: steps.check_migrations.outputs.migrations == 'true'
run: | run: |
docker-compose --file docker-compose.ci.yml up --detach sis-updater-worker docker compose --file docker-compose.ci.yml up --detach sis-updater-worker
sleep 30 # wait for sis-updater-worker to start and run migrations sleep 30 # wait for sis-updater-worker to start and run migrations
./anonyymioodi/commit_and_push_to_toska_hub.sh sis-db ./anonyymioodi/commit_and_push_to_toska_hub.sh sis-db
@@ -103,7 +103,7 @@ jobs:
- name: 'Let backend run migrations, then push new version of image to toska hub' - name: 'Let backend run migrations, then push new version of image to toska hub'
if: steps.check_migrations.outputs.migrations == 'true' if: steps.check_migrations.outputs.migrations == 'true'
run: | run: |
docker-compose --file docker-compose.ci.yml up --detach backend docker compose --file docker-compose.ci.yml up --detach backend
sleep 30 # wait for sis-updater-worker to start and run migrations sleep 30 # wait for sis-updater-worker to start and run migrations
./anonyymioodi/commit_and_push_to_toska_hub.sh kone-db ./anonyymioodi/commit_and_push_to_toska_hub.sh kone-db
@@ -136,7 +136,7 @@ jobs:
- name: 'Let backend run migrations, then push new version of image to toska hub' - name: 'Let backend run migrations, then push new version of image to toska hub'
if: steps.check_migrations.outputs.migrations == 'true' if: steps.check_migrations.outputs.migrations == 'true'
run: | run: |
docker-compose --file docker-compose.ci.yml up --detach backend docker compose --file docker-compose.ci.yml up --detach backend
sleep 30 # wait for sis-updater-worker to start and run migrations sleep 30 # wait for sis-updater-worker to start and run migrations
./anonyymioodi/commit_and_push_to_toska_hub.sh user-db ./anonyymioodi/commit_and_push_to_toska_hub.sh user-db
@@ -205,7 +205,7 @@ jobs:
password: ${{ secrets.password }} password: ${{ secrets.password }}
- name: 'Run services, pull rest of the needed images' - name: 'Run services, pull rest of the needed images'
run: docker-compose --file docker-compose.ci.yml up --detach run: docker compose --file docker-compose.ci.yml up --detach
- name: 'Check that exit statuses are not errors' - name: 'Check that exit statuses are not errors'
run: | run: |
@@ -217,4 +217,4 @@ jobs:
- name: 'Print logs on failure' - name: 'Print logs on failure'
if: failure() if: failure()
run: docker-compose --file docker-compose.ci.yml logs run: docker compose --file docker-compose.ci.yml logs
.github/workflows/updater.yaml
+5 -5
View File
@@ -89,24 +89,24 @@ jobs:
- name: 'Load scheduler image' - name: 'Load scheduler image'
run: docker load --input /tmp/artifact/scheduler.tar run: docker load --input /tmp/artifact/scheduler.tar
- name: 'Start worker' - name: 'Start worker'
run: docker-compose --file docker-compose.ci.yml up --detach --no-recreate sis-updater-worker run: docker compose --file docker-compose.ci.yml up --detach --no-recreate sis-updater-worker
- name: 'Run hourly jobs' - name: 'Run hourly jobs'
run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
env: env:
SCHEDULE_IMMEDIATE: hourly SCHEDULE_IMMEDIATE: hourly
EXIT_AFTER_IMMEDIATES: yes EXIT_AFTER_IMMEDIATES: yes
- name: 'Run weekly jobs' - name: 'Run weekly jobs'
run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
env: env:
SCHEDULE_IMMEDIATE: weekly SCHEDULE_IMMEDIATE: weekly
EXIT_AFTER_IMMEDIATES: yes EXIT_AFTER_IMMEDIATES: yes
- name: 'Run prepurge' - name: 'Run prepurge'
run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
env: env:
SCHEDULE_IMMEDIATE: prepurge SCHEDULE_IMMEDIATE: prepurge
EXIT_AFTER_IMMEDIATES: yes EXIT_AFTER_IMMEDIATES: yes
- name: 'Run purge' - name: 'Run purge'
run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
env: env:
SCHEDULE_IMMEDIATE: purge SCHEDULE_IMMEDIATE: purge
EXIT_AFTER_IMMEDIATES: yes EXIT_AFTER_IMMEDIATES: yes