From 5b27edbc287bab50ca654db38c12fb410dce5aad Mon Sep 17 00:00:00 2001
From: SoMuchForSubtlety <jakob@ahrer.dev>
Date: Wed, 31 May 2023 20:34:19 +0200
Subject: [PATCH] Simplify CI

---
 .github/workflows/ci-rootless-podman.yml | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci-rootless-podman.yml b/.github/workflows/ci-rootless-podman.yml
index 38c66784343..87ae296aef5 100644
--- a/.github/workflows/ci-rootless-podman.yml
+++ b/.github/workflows/ci-rootless-podman.yml
@@ -13,9 +13,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Uninstall unwanted packages
+        # docker would be preferred over podman
         run: sudo apt-get -q -y --purge remove podman moby-engine moby-buildx && sudo rm -rf /var/run/docker.sock
-      - name: Set XDG_RUNTIME_DIR
-        run: echo "XDG_RUNTIME_DIR=/run/user/$UID" >> $GITHUB_ENV
       - name: Configure podman
         run: |
           mkdir -p $HOME/.config/containers
@@ -28,24 +27,10 @@ jobs:
       - name: Install latest podman release
         # see https://podman.io/getting-started/installation#ubuntu
         run: |
-          sudo mkdir -p /etc/apt/keyrings
-          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
-          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
+          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
+          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
           sudo apt-get update -qq
           sudo apt-get -qq -y install podman
-      - name: Print podman environment information
-        run: podman info
-      - name: Enable podman socket
-        run: systemctl --user enable --now podman.socket
+          systemctl --user enable --now podman.socket
       - name: Build with Gradle
         run: ./gradlew --no-daemon --scan -Dtest.profile=podman testcontainers:test
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: test report
-          path: ~/work/testcontainers-java/testcontainers-java/core/build/reports/tests/**