From 83d4da5a967a163dc8cea5899fc3caae6d219714 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Tue, 2 Sep 2025 03:26:34 +0300
Subject: nightly workflow: don't build Ubuntu packages and AppImages are now
 based on OBS builds

* There are nightly OBS builds, so there is no need to build and distribute them via CI.
* On the upside we can download the packages for the AppImages from a proper (OBS) repository.
* AppImages are now built on Ubuntu 20.04 (instead of 22.04 which was the oldest
  Github runner).
---
 AppImage/curses.yml | 15 ++++++---------
 AppImage/gtk.yml    | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'AppImage')

diff --git a/AppImage/curses.yml b/AppImage/curses.yml
index 675b66c..b87101f 100755
--- a/AppImage/curses.yml
+++ b/AppImage/curses.yml
@@ -1,18 +1,15 @@
 app: sciteco-curses
 
 ingredients:
-  packages:
-    - sciteco-curses
   dist: focal
   sources:
-    - deb http://archive.ubuntu.com/ubuntu/ jammy main universe
-#  ppas:
-#    - robin-haberkorn/sciteco
-  script:
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-common_nightly_ubuntu-22.04_all.deb"
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-curses_nightly_ubuntu-22.04_amd64.deb"
+    # should always build on the oldest supported version
+    - deb http://archive.ubuntu.com/ubuntu/ focal main universe
+    - deb http://download.opensuse.org/repositories/home:/rhaberkorn:/sciteco:/UNSTABLE/xUbuntu_20.04/ /
+  packages:
+    - sciteco-curses
   post_script:
-    - dpkg -I sciteco-curses*.deb | grep "Version:" | cut -d':' -f2 | cut -d'+' -f1 | sed 's/^[ ]*//g' >VERSION
+    - dpkg -I sciteco-curses*.deb | sed -En 's/ *Version: *(.*)/\1/p' >VERSION
 
 script:
   # This is currently not installed by sciteco-curses.
diff --git a/AppImage/gtk.yml b/AppImage/gtk.yml
index 0ead771..c15ee9a 100755
--- a/AppImage/gtk.yml
+++ b/AppImage/gtk.yml
@@ -1,22 +1,19 @@
 app: sciteco-gtk
 
 ingredients:
+  dist: focal
+  sources:
+    # should always build on the oldest supported version
+    - deb http://archive.ubuntu.com/ubuntu/ focal main universe
+    - deb http://download.opensuse.org/repositories/home:/rhaberkorn:/sciteco:/UNSTABLE/xUbuntu_20.04/ /
   packages:
     - sciteco-gtk
   exclude:
     # pkg2appimage blacklists Gtk, Pango and other libs from the GNOME stack,
     # so excluding glib as well should actually improve portability.
     - libglib2.0-0
-  dist: focal
-  sources:
-    - deb http://archive.ubuntu.com/ubuntu/ jammy main universe
-#  ppas:
-#    - robin-haberkorn/sciteco
-  script:
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-common_nightly_ubuntu-22.04_all.deb"
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-gtk_nightly_ubuntu-22.04_amd64.deb"
   post_script:
-    - dpkg -I sciteco-gtk*.deb | grep "Version:" | cut -d':' -f2 | cut -d'+' -f1 | sed 's/^[ ]*//g' >VERSION
+    - dpkg -I sciteco-gtk*.deb | sed -En 's/ *Version: *(.*)/\1/p' >VERSION
 
 script:
   # FIXME: There should perhaps be a unique name in the desktop file, so it does not conflict with the Curses version.
-- 
cgit v1.2.3