From 79f5517a1faf465be75bbd89f321eb17a646e557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.cz>
Date: Fri, 3 Mar 2023 15:53:47 +0100
Subject: [PATCH] Revert "Adapt files for the SLE-15-SP5 branch"

This reverts commit ccadf4ae0e06f2082c0c61fd94a1545eca8edddb.
---
 .github/workflows/ci.yml | 22 +++++++++++++++++-----
 Rakefile                 |  2 --
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53202be..654a0a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,9 +11,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro:  [ "tumbleweed", "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -32,6 +34,8 @@ jobs:
 
     # send the coverage report to coveralls.io
     - name: Coveralls Report
+      # send it only from the TW build to avoid duplicate submits
+      if: ${{ matrix.distro == 'tumbleweed' }}
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -41,9 +45,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -58,9 +64,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro:  [ "tumbleweed", "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -75,9 +83,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -95,9 +105,11 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
 
     container:
-      image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby
+      image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
diff --git a/Rakefile b/Rakefile
index 99b7b5f..2432dd5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,5 @@
 require "yast/rake"
 
-Yast::Tasks.submit_to :sle15sp5
-
 Yast::Tasks.configuration do |conf|
   # lets ignore license check for now
   conf.skip_license_check << /.*/