Revert "Adapt files for the SLE-15-SP5 branch"

This reverts commit 678185f.
yast · Mar 3, 2023 · a39027c · a39027c
1 parent 678185f
commit a39027c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git 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:
 
@@ -94,9 +104,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
@@ -1,7 +1,5 @@
 require "yast/rake"
 
-Yast::Tasks.submit_to :sle15sp5
-
 Yast::Tasks.configuration do |conf|
   conf.skip_license_check << /\.desktop$/
   conf.skip_license_check << /\.svg$/