keep 'OpenSUSE 15' name so the PR can be merged

djmitche · Mar 2, 2024 · d7de581 · d7de581
1 parent 813ab72
commit d7de581
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -81,9 +81,10 @@ jobs:
           - name: "Ubuntu 22.04"
             runner: ubuntu-latest
             dockerfile: ubuntu2204
-          - name: "OpenSUSE Tumbleweed (Rolling)"
+          # This is actually "OpenSUSE Tumbleweed (Rolling)" but GitHub requires the "OpenSUSE 15" check, so keep that name
+          - name: "OpenSUSE 15"
             runner: ubuntu-latest
-            dockerfile: opensuse
+            dockerfile: opensuse15
           - name: "Archlinux Base (Rolling)"
             runner: ubuntu-latest
             dockerfile: arch

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -40,10 +40,10 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-opensuse:
+  test-opensuse15:
     build:
         context: .
-        dockerfile: test/docker/opensuse
+        dockerfile: test/docker/opensuse15
     network_mode: "host"
     security_opt:
       - label=type:container_runtime_t

diff --git a/test/docker/opensuse → test/docker/opensuse15 b/test/docker/opensuse → test/docker/opensuse15
@@ -1,5 +1,8 @@
 FROM opensuse/tumbleweed
 
+# NOTE: this isn't opensuse15 anymore, but this allows PRs to be merged by
+# matching the GitHub configuration.
+
 RUN zypper install -y python3 awk coreutils git gcc gcc-c++ cmake make libuuid-devel libfaketime curl
 
 # Setup language environment