Skip to content

Commit 7776c9a

Browse files
committed
Try another iteration gor GH actions
1 parent 7e8d1fe commit 7776c9a

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,15 @@ name: Test Suite
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414

15-
services:
16-
docker:
17-
image: docker:19.03.12
18-
options: >-
19-
--privileged
20-
2115
steps:
2216
- name: Checkout code
2317
uses: actions/checkout@v2
@@ -27,8 +21,10 @@ jobs:
2721
with:
2822
ruby-version: 2.7
2923

30-
- name: Install Docker
24+
- name: Install Docker and Docker Compose
3125
run: |
26+
# Remove conflicting containerd package if it exists
27+
sudo apt-get remove -y containerd
3228
sudo apt-get update
3329
sudo apt-get install -y docker.io docker-compose
3430

0 commit comments

Comments
 (0)