Merge branch 'prerel' into feat/default-sock-path

.gitlab-ci-scripts/install-extra-packages.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+case ${DISTRO} in
+    fedora)
+            yum -y clean all
+            yum -y install clibs-list-devel
+        ;;
+    centos)
+            yum -y clean all
+            yum -y install clibs-list-devel cjson-devel
+        ;;
+    almalinux)
+            yum -y clean all
+            dnf -y upgrade almalinux-release --nogpgcheck
+            yum -y install clibs-list-devel curl-devel systemd-rpm-macros webkit2gtk3-devel\
+                gstreamer1 gstreamer1-plugins-base
+        ;;
+    rockylinux)
+            yum -y clean all
+            yum -y install cjson-devel clibs-list-devel curl-devel systemd-rpm-macros webkit2gtk3-devel\
+                gstreamer1 gstreamer1-plugins-base
+        ;;
+    opensuse)
+                zypper -n install cJSON-devel systemd-rpm-macros webkit2gtk3-devel
+        ;;
+esac

.gitlab-ci-scripts/local-before-script.sh

@@ -7,10 +7,9 @@ echo "======== oidc-agent-local-before-script starting======="
 export VERSION=`cat VERSION`
 # clone the packages file of this repo:
 # Try with VERSION
-echo "Trying to use branch for packaging: ${PACKAGING_BRANCH}/v${VERSION}"
-git clone -b ${PACKAGING_BRANCH}/v${VERSION} http://codebase.helmholtz.cloud/m-team/oidc/oidc-agent.git delme || {
-    echo "Falling back to ${PACKAGING_BRANCH}/latest"
-    git clone -b ${PACKAGING_BRANCH}/latest http://codebase.helmholtz.cloud/m-team/oidc/oidc-agent.git delme
+echo "Trying to use branch for packaging: ${PACKAGING_BRANCH}/test-ellert-spec"
+git clone -b ${PACKAGING_BRANCH}/test-ellert-spec http://codebase.helmholtz.cloud/m-team/oidc/oidc-agent.git delme || {
+    exit 10
 }
 
 

.gitlab-ci.yml

@@ -145,4 +145,7 @@ trigger-win-installer:
                     --upstream-pipeline-id ${TRIGGERED_PIPELINE_ID}
   artifacts:
     paths:
-      - "results/*"
+      - "results/*" 
+
+
+

Makefile

@@ -187,6 +187,10 @@ CPPFLAGS += -fPIC
 ifndef MAC_OS
 ifndef ANY_MSYS
 WEBKITGTK ?= webkit2gtk-4.0
+WEBKITGTK41:= $(firstword $(wildcard /usr/include/webkitgtk-4.1))
+ifneq (,$(WEBKITGTK41))
+	WEBKITGTK=webkit2gtk-4.1
+endif
 CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 $(WEBKITGTK)) -lstdc++
 endif
 endif