Skip to content
Snippets Groups Projects
Commit 59e284ad authored by Ed Maros's avatar Ed Maros
Browse files

Merge branch '142-ubuntu-22_04-jammy' into 'ldas-tools-suite-2.9.x' 

Added CI/CD pipeline for Ubuntu 22.04 (Closes #142)

See merge request !198
parent 8117a3a4
No related branches found
No related tags found
1 merge request!199Merge branch '142-ubuntu-22_04-jammy' into 'ldas-tools-suite-2.9.x'
Hide whitespace changes
Inline Side-by-side
Showing
with 181 additions and 32 deletions
.gitlab-ci-local/deb.yml
+ 0
− 21
View file @ 59e284ad
......@@ -110,41 +110,20 @@ variables:
.deb-install-dependencies-script: &deb-install-dependencies |-
#--------------------------------------------------------------------
echo 'DEBUG: Debian install dependencies'
# apt-get purge -y --ignore-missing ${DEB_REMOVE_PACKAGES} || true
# ls -ld ${DEPENDENCY_SCRIPT} || true
if test ! -e ${DEPENDENCY_SCRIPT}; \
then \
apt-get install -y ${DEB_INSTALL_OPTIONS} ${IGWN_CMAKE_PACKAGE_NAME}; \
dpkg -L ${IGWN_CMAKE_PACKAGE_NAME}
fi
# apt-get purge -y --ignore-missing ${DEB_REMOVE_PACKAGES} || true
ls ${PROJECT_PACKAGE_FULL_DIR}/ldas_pkgs || true
${DEB_CMAKE_COMMAND} \
-DPACKAGER=deb \
-DINSTALL=TRUE \
-DPROJECT_NAME="${PROJECT_PACKAGE_NAME}" \
-DBOOST_MINIMUM_VERSION=${BOOST_MINIMUM_VERSION} \
-DIGWN_CMAKE_VERSION=${IGWN_CMAKE_VERSION} \
-DLDAS_TOOLS_AL_SWIG_VERSION=${LDAS_TOOLS_AL_SWIG_VERSION} \
-DLDAS_TOOLS_AL_VERSION=${LDAS_TOOLS_AL_VERSION} \
-DLDAS_TOOLS_CMAKE_VERSION=${LDAS_TOOLS_CMAKE_VERSION} \
-DLDAS_TOOLS_DISKCACHEAPI_SWIG_VERSION=${LDAS_TOOLS_DISKCACHEAPI_SWIG_VERSION} \
-DLDAS_TOOLS_DISKCACHEAPI_VERSION=${LDAS_TOOLS_DISKCACHEAPI_VERSION} \
-DLDAS_TOOLS_FILTERS_VERSION=${LDAS_TOOLS_FILTERS_VERSION} \
-DLDAS_TOOLS_FRAMEAPI_SWIG_VERSION=${LDAS_TOOLS_FRAMEAPI_SWIG_VERSION} \
-DLDAS_TOOLS_FRAMEAPI_VERSION=${LDAS_TOOLS_FRAMEAPI_VERSION} \
-DLDAS_TOOLS_FRAMECPP_SWIG_VERSION=${LDAS_TOOLS_FRAMECPP_SWIG_VERSION} \
-DLDAS_TOOLS_FRAMECPP_VERSION=${LDAS_TOOLS_FRAMECPP_VERSION} \
-DLDAS_TOOLS_LDASGEN_SWIG_VERSION=${LDAS_TOOLS_LDASGEN_SWIG_VERSION} \
-DLDAS_TOOLS_LDASGEN_VERSION=${LDAS_TOOLS_LDASGEN_VERSION} \
-DLDAS_TOOLS_UTILITIES_VERSION=${LDAS_TOOLS_UTILITIES_VERSION} \
-DLDAS_TOOLS_SWIG_VERSION=${LDAS_TOOLS_SWIG_VERSION} \
-DTOP_DIR=${CI_PROJECT_DIR}/${PROJECT_DIR} \
-DPYTHON2_VERSION=${PY2} \
-DPYTHON3_VERSION=${PY3} \
-DEXCLUDE_PATTERN="${DEB_EXCLUDE_PATTERN}" \
-P ${DEPENDENCY_SCRIPT}
# apt-get purge -y --ignore-missing ${DEB_REMOVE_PACKAGES} || true
.deb-local-pkgs-function: &deb-local-pkgs-function
- deb_local_pkgs() {
......
.gitlab-ci-local/ubuntu-22.04-jammy.yml 0 → 100644
+ 165
− 0
View file @ 59e284ad
#------------------------------------------------------------------------
# Ubuntu - Jammy ( 22.04 )
#------------------------------------------------------------------------
#;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
# Ubuntu 22.04 - default
#;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
.image-ubuntu2204:
image: ubuntu:22.04
.ubuntu2204:common:
extends:
- .image-ubuntu2204
- .only-ci
.ubuntu2204_deb_build_cmake_package:
variables:
DEB_EXCLUDE_PATTERN: '^(libboost.*1.67.*|python|python(2|)|python(2|)-dev|python(2|)-numpy)$'
extends:
- .ubuntu2204:common
- .deb_build_cmake_package
ubuntu2204:igwn_cmake:
variables:
DEB_REMOTE_PACKAGE_REPO: ${REMOTE_PACKAGE_HOST}/igwn-cmake/local-release-ubuntu2204/all/igwn-cmake-macros_${IGWN_CMAKE_VERSION}-1_all.deb
extends:
- .ubuntu2204:common
- .deb-localize-repo
- .stage-igwn-cmake
ubuntu2204:ldastools_cmake:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-ldastools-cmake
needs:
- ubuntu2204:igwn_cmake
ubuntu2204:ldastoolsal:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-ldastoolsal
needs:
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:ldastoolsal-swig:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-ldastoolsal-swig
needs:
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:filters:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-filters
needs:
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:framecpp:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-framecpp
needs:
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
.ubuntu2204:framecpp-swig:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-framecpp-swig
needs:
- ubuntu2204:ldastoolsal-swig
- ubuntu2204:ldastoolsal
- ubuntu2204:framecpp
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:ldasgen:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-ldasgen
needs:
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:ldasgen-swig:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-ldasgen-swig
needs:
- ubuntu2204:ldasgen
- ubuntu2204:ldastoolsal-swig
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:diskcache:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-diskcache
needs:
- ubuntu2204:ldasgen
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:diskcache-swig:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-diskcache-swig
needs:
- ubuntu2204:diskcache
- ubuntu2204:ldasgen-swig
- ubuntu2204:ldasgen
- ubuntu2204:ldastoolsal-swig
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:frameutils:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-frameutils
needs:
- ubuntu2204:ldasgen
- ubuntu2204:filters
- ubuntu2204:framecpp
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
.ubuntu2204:frameutils-swig:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-frameutils-swig
needs:
- ubuntu2204:frameutils
- ubuntu2204:ldasgen-swig
- ubuntu2204:ldasgen
- ubuntu2204:framecpp-swig
- ubuntu2204:framecpp
- ubuntu2204:ldastoolsal-swig
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
ubuntu2204:utilities:
extends:
- .ubuntu2204_deb_build_cmake_package
- .setup-utilities
needs:
- ubuntu2204:diskcache
- ubuntu2204:frameutils
- ubuntu2204:ldasgen
- ubuntu2204:filters
- ubuntu2204:framecpp
- ubuntu2204:ldastoolsal
- ubuntu2204:ldastools_cmake
- ubuntu2204:igwn_cmake
.gitlab-ci.yml
+ 1
− 0
View file @ 59e284ad
......@@ -21,6 +21,7 @@ include:
- local: '/.gitlab-ci-local/ubuntu-2004.yml'
- local: '/.gitlab-ci-local/ubuntu-2204.yml'
- local: '/.gitlab-ci-local/redhat-rl9.yml'
- local: '/.gitlab-ci-local/ubuntu-22.04-jammy.yml'
- local: '/.gitlab-ci-local/documentation.yml'
.global-before-script: &global-before-script |-
......
ChangeLog.md
+ 1
− 0
View file @ 59e284ad
......@@ -9,6 +9,7 @@
- Added CI/CD pipeline for Enterpise Linux 7
- Renamed Debian Bullseye files to include release number
- Added CI/CD pipeline for Debian 12 bookworm
- Added CI/CD pipeline for Ubuntu 22.04 (Jammy) (closes #142)
# LDAS Tools Suite
......
filters/config/control.in
+ 3
− 3
View file @ 59e284ad
Source: @PROJECT_NAME@
Source: @LDAS_TOOLS_FILTERS_PACKAGE_NAME@
Section: lscsoft
Priority: optional
Maintainer: Steffen Grunewald <steffen.grunewald@ligo.org>
......@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9),
ldas-tools-al-dev (>= @LDAS_TOOLS_AL_VERSION@)
Standards-Version: 3.8.6
Package: ldas-tools-filters
Package: @LDAS_TOOLS_FILTERS_PACKAGE_NAME@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
zlib1g,
......@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
Description: LDAS tools libfilters toolkit runtime files
This provides the runtime libraries for the filters library.
Package: ldas-tools-filters-dev
Package: @LDAS_TOOLS_FILTERS_PACKAGE_NAME@-dev
Architecture: any
Depends: ${misc:Depends},
automake,
......
ldasgen-swig/config/control.in
+ 2
− 2
View file @ 59e284ad
Source: @PROJECT_NAME@
Source: @LDAS_TOOLS_LDASGEN_SWIG_PACKAGE_NAME@
Section: lscsoft
Priority: optional
Maintainer: Edward Maros <ed.maros@ligo.org>
......@@ -21,7 +21,7 @@ X-Python-Version: >= 2.6
X-Python3-Version: >= 3.2
#========================================================================
Package: ldas-tools-ldasgen-swig
Package: @LDAS_TOOLS_LDASGEN_SWIG_PACKAGE_NAME@
Section: lscsoft
Architecture: any
Depends:
......
ldastoolsal-swig/config/control.in
+ 2
− 2
View file @ 59e284ad
Source: @PROJECT_NAME@
Source: @LDAS_TOOLS_AL_SWIG_PACKAGE_NAME@
Section: lscsoft
Priority: optional
Maintainer: Edward Maros <ed.maros@ligo.org>
......@@ -15,7 +15,7 @@ Standards-Version: 4.1.1
X-Python3-Version: >= 3.2
#========================================================================
Package: ldas-tools-al-swig
Package: @LDAS_TOOLS_AL_SWIG_PACKAGE_NAME@
Section: lscsoft
Architecture: any
Depends:
......
ldastoolsal-swig/debian/python3-ldas-tools-al.install
+ 1
− 1
View file @ 59e284ad
usr/lib/python3*
\ No newline at end of file
usr/lib/python3*
ldastoolsal-swig/debian/rules
+ 4
− 1
View file @ 59e284ad
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
%:
dh $@ --buildsystem=cmake --parallel
override_dh_auto_configure:
dh_auto_configure --buildsystem=cmake -- -DENABLE_SWIG_PYTHON2=no -DENABLE_SWIG_PYTHON3=yes -DPYTHON3_EXECUTABLE=/usr/bin/python3
dh_auto_configure --buildsystem=cmake -- -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SWIG_PYTHON2=no -DENABLE_SWIG_PYTHON3=yes -DPYTHON3_EXECUTABLE=/usr/bin/python3
utilities/config/control.in
+ 2
− 2
View file @ 59e284ad
Source: @PROJECT_NAME@
Source: @LDAS_TOOLS_UTILITIES_PACKAGE_NAME@
Section: lscsoft
Priority: optional
# OldMaintainer: Miroslav Shaltev <cluster-hannover@aei.mpg.de>
......@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9),
Standards-Version: 3.8.6
X-Python-Version: >= 2.6
Package: @PROJECT_NAME@
Package: @LDAS_TOOLS_UTILITIES_PACKAGE_NAME@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libboost-filesystem1.74.0 | libboost-filesystem1.71.0 | libboost-filesystem1.67.0,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment