[NetworkManager-openconnect/citest] Update Fedora Docker image to last supported release
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [NetworkManager-openconnect/citest] Update Fedora Docker image to last supported release
- Date: Tue, 19 Apr 2022 21:28:48 +0000 (UTC)
commit 51a2d965423fdfd35f3ae77892871c19393b10b6
Author: Romain Failliot <romain failliot foolstep com>
Date: Fri Apr 15 03:38:51 2022 +0000
Update Fedora Docker image to last supported release
As per this Fedora documentation page: https://docs.fedoraproject.org/en-US/releases/eol/
Fedora 28 reached EOL the 2019-05-28.
The last Fedora release to be supported is Fedora 34, which will be EOL once Fedora 37 is out (the N-2
rule).
.gitlab-ci.yml | 10 ++++------
Makefile.am | 2 ++
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcaf19f..9a65124 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@
.dist: &dist
stage: test
dependencies:
- - fedora28_dist
+ - fedora34_dist
variables:
GIT_STRATEGY: none
@@ -47,17 +47,15 @@
- make -j uninstall
# Roll the distribution tarball
-fedora28_dist:
+fedora34_dist:
<<: *fedora_deps
- image: fedora:28
+ image: fedora:34
stage: build
script:
- dnf -y install
/usr/bin/autopoint
autoconf automake make
- NetworkManager-devel
- NetworkManager-glib-devel
- libnm-gtk-devel
+ libnma-devel
- sh autogen.sh
- make -j dist
artifacts:
diff --git a/Makefile.am b/Makefile.am
index fa9d0ea..0c97634 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,8 +97,10 @@ EXTRA_DIST += \
# Include a prebuilt file in tarball, to avoid hitting
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4415
+if WITH_GTK4
EXTRA_DIST += \
gtk4/nm-openconnect-dialog.ui
+endif
plugin_sources = \
properties/nm-openconnect-editor-plugin.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]