Skip to content

Commit 26a0e1d

Browse files
committed
changed ubuntu-20.04 to ubuntu-22.04, docker-compose changed to docker compose
1 parent 4e88ba1 commit 26a0e1d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/label_merge_conflicts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push]
44

55
jobs:
66
find_conflicts:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88

99
steps:
1010
- uses: mschilde/auto-label-merge-conflicts@master

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
2323
- name: Build docker-compose
2424
run: |
25-
docker-compose build
25+
docker compose build
2626
2727
- name: Run docker-compose
2828
run:
29-
APP_CONF=../app_conf/testing.ini docker-compose up -d
29+
APP_CONF=../app_conf/testing.ini docker compose up -d
3030

3131
- name: Run tests
3232
run: |
3333
docker ps -a
34-
docker-compose logs
34+
docker compose logs
3535
docker exec web_speech_trainer_web_1 bash -c 'cd /project/tests && pytest .'

0 commit comments

Comments
 (0)