Skip to content

Commit 65b6aeb

Browse files
Use ubuntu-22.04 (#6771)
Use existing rootless-docker GHA for rootless CI which makes test run in ubuntu-22.04
1 parent c90daab commit 65b6aeb

File tree

4 files changed

+10
-27
lines changed

4 files changed

+10
-27
lines changed

.github/workflows/ci-docker-wormhole.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
in-docker_test:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Build with Gradle

.github/workflows/ci-examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919

2020
jobs:
2121
find_gradle_jobs:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2323
outputs:
2424
matrix: ${{ steps.set-matrix.outputs.matrix }}
2525
steps:
@@ -45,7 +45,7 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
48-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-22.04
4949
steps:
5050
- uses: actions/checkout@v3
5151
- uses: actions/setup-java@v3

.github/workflows/ci-rootless.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,13 @@ permissions:
1313

1414
jobs:
1515
test:
16-
runs-on: ubuntu-20.04
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
include:
21-
- { XDG_RUNTIME_DIR: "" }
22-
- { XDG_RUNTIME_DIR: "/tmp/docker-testcontainers/" }
23-
env:
24-
XDG_RUNTIME_DIR: ${{ matrix.XDG_RUNTIME_DIR }}
16+
runs-on: ubuntu-22.04
2517
steps:
2618
- uses: actions/checkout@v3
27-
- name: debug
28-
run: id -u; whoami
29-
- name: uninstall rootful Docker
30-
run: sudo apt-get -q -y --purge remove moby-engine moby-buildx && sudo rm -rf /var/run/docker.sock
31-
- name: install rootless Docker
32-
run: |
33-
mkdir -p $XDG_RUNTIME_DIR || true
34-
curl -fsSL https://get.docker.com/rootless | sh > init.sh
35-
cat init.sh
36-
source <(grep '^export' init.sh)
37-
PATH=$HOME/bin:$PATH dockerd-rootless.sh --experimental --storage-driver vfs &
38-
sleep 1
39-
DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock docker info || ls -la $XDG_RUNTIME_DIR
19+
- name: Setup rootless Docker
20+
uses: ScribeMD/[email protected]
21+
- name: Remove Docket root socket
22+
run: sudo rm -rf /var/run/docker.sock
4023
- name: Setup Gradle Build Action
4124
uses: gradle/gradle-build-action@v2
4225
- name: Build with Gradle

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919

2020
jobs:
2121
find_gradle_jobs:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2323
outputs:
2424
matrix: ${{ steps.set-matrix.outputs.matrix }}
2525
steps:
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
47-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
4848
steps:
4949
- uses: actions/checkout@v3
5050
- uses: actions/setup-java@v3

0 commit comments

Comments
 (0)