Skip to content

Commit fabe1bc

Browse files
Simplify CI
1 parent 1e99807 commit fabe1bc

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

.github/workflows/ci-rootless-podman.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v3
1515
- name: Uninstall unwanted packages
16+
# docker would be preferred over podman
1617
run: sudo apt-get -q -y --purge remove podman moby-engine moby-buildx && sudo rm -rf /var/run/docker.sock
17-
- name: Set XDG_RUNTIME_DIR
18-
run: echo "XDG_RUNTIME_DIR=/run/user/$UID" >> $GITHUB_ENV
1918
- name: Configure podman
2019
run: |
2120
mkdir -p $HOME/.config/containers
@@ -28,24 +27,10 @@ jobs:
2827
- name: Install latest podman release
2928
# see https://podman.io/getting-started/installation#ubuntu
3029
run: |
31-
sudo mkdir -p /etc/apt/keyrings
32-
curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/Release.key \
33-
| gpg --dearmor \
34-
| sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
35-
echo \
36-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
37-
https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/ /" \
38-
| sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
30+
curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/Release.key | gpg --dearmor | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
31+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg] https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$(lsb_release -rs)/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
3932
sudo apt-get update -qq
4033
sudo apt-get -qq -y install podman
41-
- name: Print podman environment information
42-
run: podman info
43-
- name: Enable podman socket
44-
run: systemctl --user enable --now podman.socket
34+
systemctl --user enable --now podman.socket
4535
- name: Build with Gradle
4636
run: ./gradlew --no-daemon --scan -Dtest.profile=podman testcontainers:test
47-
- uses: actions/upload-artifact@v3
48-
if: failure()
49-
with:
50-
name: test report
51-
path: ~/work/testcontainers-java/testcontainers-java/core/build/reports/tests/**

0 commit comments

Comments
 (0)