From ecab1537458e9947c972ddfa38248573ea9b19d1 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 23 Dec 2023 11:18:37 -0500 Subject: [PATCH 1/3] Remove EOL Fedora 37 from CI --- .gitlab-ci.yml | 69 ------------------------------------ ci/fedora37/Dockerfile | 80 ------------------------------------------ 2 files changed, 149 deletions(-) delete mode 100644 ci/fedora37/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8bfeacd44..d3cb6f34b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -314,18 +314,6 @@ rocky9-build: variables: IMAGE: rocky9 -fedora37-build: - <<: *rpm_build_definition - needs: - - job: docker_build_fedora37 - artifacts: false - - job: portable-source - artifacts: true - tags: - - linux - variables: - IMAGE: fedora37 - fedora38-build: <<: *rpm_build_definition needs: @@ -788,26 +776,6 @@ rocky9-cmake-build: variables: IMAGE: rocky9 -fedora37-cmake-build: - <<: *rpm_build_definition - needs: - - job: docker_build_fedora37 - artifacts: false - before_script: - - export build_system="cmake" - # fail on any compiler warnings - - export CFLAGS="-Werror -Wno-deprecated-declarations" - - export CXXFLAGS="-Werror -Wno-deprecated-declarations" - - export CMAKE_OPTIONS="-Dwith_smyrna=ON" - - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Denable_ltdl=ON" - - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_expat=ON" - - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_gvedit=ON" - - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_zlib=ON" - tags: - - linux - variables: - IMAGE: fedora37 - fedora38-cmake-build: <<: *rpm_build_definition needs: @@ -1052,18 +1020,6 @@ rocky9-test: variables: IMAGE: rocky9 -fedora37-test: - <<: *linux_test_definition - before_script: - - export build_system="autotools" - needs: - - job: "fedora37-build" - artifacts: true - tags: - - linux - variables: - IMAGE: fedora37 - fedora38-test: <<: *linux_test_definition before_script: @@ -1195,19 +1151,6 @@ rocky9-cmake-test: variables: IMAGE: rocky9 -fedora37-cmake-test: - <<: *linux_test_definition - before_script: - - export build_system="cmake" - - python3 gen_version.py --output GRAPHVIZ_VERSION - needs: - - job: "fedora37-cmake-build" - artifacts: true - tags: - - linux - variables: - IMAGE: fedora37 - fedora38-cmake-test: <<: *linux_test_definition before_script: @@ -1366,11 +1309,6 @@ docker_build_rocky9: variables: IMAGE: rocky9 -docker_build_fedora37: - <<: *docker_build_definition - variables: - IMAGE: fedora37 - docker_build_fedora38: <<: *docker_build_definition variables: @@ -1412,13 +1350,6 @@ docker_push_rocky9: needs: - docker_build_rocky9 -docker_push_fedora37: - <<: *docker_push_definition - variables: - IMAGE: fedora37 - needs: - - docker_build_fedora37 - docker_push_fedora38: <<: *docker_push_definition variables: diff --git a/ci/fedora37/Dockerfile b/ci/fedora37/Dockerfile deleted file mode 100644 index d888ac0b33..0000000000 --- a/ci/fedora37/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -FROM fedora:37 - -COPY requirements.txt ./requirements.txt - -# Development tools -RUN yum -y groupinstall 'Development Tools' \ -&& yum -y install rpm-build \ -bison \ -byacc \ -flex \ -# Centos build utilities -libtool-ltdl-devel \ -libedit-devel \ -ksh \ -cmake \ -# Option xpat -expat-devel \ -# Option glut -freeglut-devel \ -# Option ann -ann-devel \ -# Option gts -gts-devel \ -# Option swig -swig \ -# Command smyra -# Command gvedit -qt5-qtbase-devel \ -ncurses-devel \ -# Plugin library devil -DevIL-devel \ -# Plugin library gd -gd-devel \ -# Documentation and Plugin library ghostscipt -ghostscript ghostscript-devel \ -# Plugin library gtk -gtkglext-devel \ -# Plugin library lasi -lasi-devel \ -# Plugin library poppler -poppler-glib-devel \ -poppler-qt5 \ -# Plugin library rsvg -librsvg2-devel \ -# Language extension gv_go -golang \ -gcc-go \ -# Language extension gv_guile -guile30-devel \ -# Language extension gv_java -java-devel \ -# Language extension gv_lua -lua-devel \ -# Language extension gv_ocaml -ocaml \ -# Language extension gv_perl -perl \ -perl-ExtUtils-Embed \ -# Language extension gv_php -php-devel \ -# Language extension gv_python3 -python3-devel \ -# Language extension gv_R -R \ -R-devel \ -# Language extension gv_ruby -ruby-devel \ -# Language extension gv_tcl -# Required in redhat/graphviz.spec.fedora.in -libXaw-devel \ -libglade2-devel \ -mono-core \ -# Test utilities -python3-pip \ -python3-setuptools \ -# install Python dependencies -&& python3 -m pip install --user --upgrade pip \ -&& python3 -m pip install --user --requirement requirements.txt \ -# Clean up -&& yum clean all && rm -rf /var/cache/yum -- GitLab From 91ff1b4082e23b2844b025ade9f78f7d02f031b3 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 23 Dec 2023 11:28:44 -0500 Subject: [PATCH 2/3] CI: Add fedora39/Dockerfile --- ci/fedora39/Dockerfile | 80 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 ci/fedora39/Dockerfile diff --git a/ci/fedora39/Dockerfile b/ci/fedora39/Dockerfile new file mode 100644 index 0000000000..a6619236f4 --- /dev/null +++ b/ci/fedora39/Dockerfile @@ -0,0 +1,80 @@ +FROM fedora:39 + +COPY requirements.txt ./requirements.txt + +# Development tools +RUN yum -y groupinstall 'Development Tools' \ +&& yum -y install rpm-build \ +bison \ +byacc \ +flex \ +# Centos build utilities +libtool-ltdl-devel \ +libedit-devel \ +ksh \ +cmake \ +# Option xpat +expat-devel \ +# Option glut +freeglut-devel \ +# Option ann +ann-devel \ +# Option gts +gts-devel \ +# Option swig +swig \ +# Command smyra +# Command gvedit +qt5-qtbase-devel \ +ncurses-devel \ +# Plugin library devil +DevIL-devel \ +# Plugin library gd +gd-devel \ +# Documentation and Plugin library ghostscipt +ghostscript ghostscript-devel \ +# Plugin library gtk +gtkglext-devel \ +# Plugin library lasi +lasi-devel \ +# Plugin library poppler +poppler-glib-devel \ +poppler-qt5 \ +# Plugin library rsvg +librsvg2-devel \ +# Language extension gv_go +golang \ +gcc-go \ +# Language extension gv_guile +guile30-devel \ +# Language extension gv_java +java-devel \ +# Language extension gv_lua +lua-devel \ +# Language extension gv_ocaml +ocaml \ +# Language extension gv_perl +perl \ +perl-ExtUtils-Embed \ +# Language extension gv_php +php-devel \ +# Language extension gv_python3 +python3-devel \ +# Language extension gv_R +R \ +R-devel \ +# Language extension gv_ruby +ruby-devel \ +# Language extension gv_tcl +# Required in redhat/graphviz.spec.fedora.in +libXaw-devel \ +libglade2-devel \ +mono-core \ +# Test utilities +python3-pip \ +python3-setuptools \ +# install Python dependencies +&& python3 -m pip install --user --upgrade pip \ +&& python3 -m pip install --user --requirement requirements.txt \ +# Clean up +&& yum clean all && rm -rf /var/cache/yum -- GitLab From ec31fee405f00678ee085f4b258999b80bec31f7 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 23 Dec 2023 11:31:32 -0500 Subject: [PATCH 3/3] CI: Add fedora39 jobs --- .gitlab-ci.yml | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3cb6f34b2..e99afa3a77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -326,6 +326,18 @@ fedora38-build: variables: IMAGE: fedora38 +fedora39-build: + <<: *rpm_build_definition + needs: + - job: docker_build_fedora39 + artifacts: false + - job: portable-source + artifacts: true + tags: + - linux + variables: + IMAGE: fedora39 + ubuntu-20.04-debug-build: <<: *deb_build_definition needs: @@ -796,6 +808,26 @@ fedora38-cmake-build: variables: IMAGE: fedora38 +fedora39-cmake-build: + <<: *rpm_build_definition + needs: + - job: docker_build_fedora39 + artifacts: false + before_script: + - export build_system="cmake" + # fail on any compiler warnings + - export CFLAGS="-Werror -Wno-deprecated-declarations" + - export CXXFLAGS="-Werror -Wno-deprecated-declarations" + - export CMAKE_OPTIONS="-Dwith_smyrna=ON" + - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Denable_ltdl=ON" + - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_expat=ON" + - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_gvedit=ON" + - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_zlib=ON" + tags: + - linux + variables: + IMAGE: fedora39 + macos-cmake-build: <<: *macos_build_definition before_script: @@ -1032,6 +1064,18 @@ fedora38-test: variables: IMAGE: fedora38 +fedora39-test: + <<: *linux_test_definition + before_script: + - export build_system="autotools" + needs: + - job: "fedora39-build" + artifacts: true + tags: + - linux + variables: + IMAGE: fedora39 + macos-autotools-test: <<: *test_definition before_script: @@ -1164,6 +1208,19 @@ fedora38-cmake-test: variables: IMAGE: fedora38 +fedora39-cmake-test: + <<: *linux_test_definition + before_script: + - export build_system="cmake" + - python3 gen_version.py --output GRAPHVIZ_VERSION + needs: + - job: "fedora39-cmake-build" + artifacts: true + tags: + - linux + variables: + IMAGE: fedora39 + macos-cmake-test: <<: *test_definition before_script: @@ -1314,6 +1371,11 @@ docker_build_fedora38: variables: IMAGE: fedora38 +docker_build_fedora39: + <<: *docker_build_definition + variables: + IMAGE: fedora39 + docker_build_ubuntu-20.04: <<: *docker_build_definition variables: @@ -1357,6 +1419,13 @@ docker_push_fedora38: needs: - docker_build_fedora38 +docker_push_fedora39: + <<: *docker_push_definition + variables: + IMAGE: fedora39 + needs: + - docker_build_fedora39 + docker_push_ubuntu-20.04: <<: *docker_push_definition variables: -- GitLab