Package Krill for Ubuntu 22.04 Jammy Jellyfish (#838)

* Package Krill for Ubuntu 22.04 Jammy Jellyish
* Depend on libssl3 for Ubuntu 22.04 instead of libssl1.1
This commit is contained in:
Ximon Eighteen
2022-07-19 09:17:20 +02:00
committed by GitHub
parent 1cc69885db
commit dde7041e79
3 changed files with 28 additions and 10 deletions
+24 -10
View File
@@ -90,11 +90,14 @@ jobs:
- 'ubuntu:xenial' # ubuntu/16.04
- 'ubuntu:bionic' # ubuntu/18.04
- 'ubuntu:focal' # ubuntu/20.04
- 'ubuntu:jammy' # ubuntu/22.04
- 'debian:stretch' # debian/9
- 'debian:buster' # debian/10
- 'debian:bullseye' # debian/11
- 'centos:7'
- 'rockylinux:8' # compatible with EOL centos:8
target:
- 'x86_64'
include:
# For CentOS 7 we want to statically link with OpenSSL, but `cargo generate-rpm` doesn't build the code for
# unlike `cargo deb` so we have to control the feature set used for building ourselves rather than in
@@ -131,6 +134,7 @@ jobs:
shell: bash
env:
MATRIX_IMAGE: ${{ matrix.image }}
MATRIX_OS: ${{ matrix.os }}
run: |
# Get the operating system and release name (e.g. ubuntu and xenial) from the image name (e.g. ubuntu:xenial) by
# extracting only the parts before and after but not including the colon:
@@ -140,9 +144,6 @@ jobs:
fi
echo "OS_NAME=${IMAGE%:*}" >> $GITHUB_ENV
echo "OS_REL=${IMAGE#*:}" >> $GITHUB_ENV
env:
MATRIX_IMAGE: ${{ matrix.image }}
MATRIX_OS: ${{ matrix.os }}
# Git clone the Krill code in the branch we were invoked on.
- name: Checkout repository
@@ -308,10 +309,18 @@ jobs:
echo " * See: https://github.com/NLnetLabs/krill/releases/tag/v${KRILL_NEW_VER}" >>target/debian/changelog
echo " -- maintainer ${MAINTAINER} ${RFC5322_TS}" >>target/debian/changelog
if [[ "${CROSS_TARGET}" == "x86_64" ]]; then
EXTRA_CARGO_DEB_ARGS=
VARIANT="${OS_NAME}-${OS_REL}"
else
EXTRA_CARGO_DEB_ARGS="--no-build --no-strip --target ${CROSS_TARGET} --output target/debian"
VARIANT="${OS_NAME}-${OS_REL}-${CROSS_TARGET}"
fi
if [ "${MATRIX_PKG}" == "krillup" ]; then
# Ugly hack to use an alternate Cargo Deb configuration for krillup.
sed -i -e 's/^\[package\.metadata\.deb\]/[package.metadata.moved-deb]/' \
-e 's/^\[package\.metadata\.krillup-deb/[package.metadata.deb/' Cargo.toml
# Ugly hack to use an alternate Cargo Deb configuration for krillup.
sed -i -e 's/^\[package\.metadata\.deb\]/[package.metadata.moved-deb]/' \
-e 's/^\[package\.metadata\.krillup-deb/[package.metadata.deb/' Cargo.toml
fi
DEB_VER="${PKG_KRILL_VER}-1${OS_REL}"
@@ -392,7 +401,7 @@ jobs:
- name: Upload package
uses: actions/upload-artifact@v2
with:
name: ${{ matrix.pkg }}_${{ env.OS_NAME }}_${{ env.OS_REL }}
name: ${{ matrix.pkg }}_${{ env.OS_NAME }}_${{ env.OS_REL }}_${{ matrix.target }}
path: |
target/debian/*.deb
target/generate-rpm/*.rpm
@@ -427,6 +436,7 @@ jobs:
- 'ubuntu:xenial' # ubuntu/16.04
- 'ubuntu:bionic' # ubuntu/18.04
- 'ubuntu:focal' # ubuntu/20.04
- 'ubuntu:jammy' # ubuntu/22.04
- 'debian:stretch' # debian/9
- 'debian:buster' # debian/10
- 'debian:bullseye' # debian/11
@@ -448,6 +458,9 @@ jobs:
# - image: 'debian:bullseye'
# mode: 'upgrade-from-published'
exclude:
- pkg: 'krill'
mode: 'upgrade-from-published'
image: 'ubuntu:jammy'
- pkg: 'krillup'
mode: 'upgrade-from-published'
image: 'ubuntu:xenial' # ubuntu/16.04
@@ -457,6 +470,9 @@ jobs:
- pkg: 'krillup'
mode: 'upgrade-from-published'
image: 'ubuntu:focal' # ubuntu/20.04
- pkg: 'krillup'
mode: 'upgrade-from-published'
image: 'ubuntu:jammy' # ubuntu/22.04
- pkg: 'krillup'
mode: 'upgrade-from-published'
image: 'debian:stretch' # debian/9
@@ -499,13 +515,11 @@ jobs:
echo "LXC_IMAGE=images:${OS_NAME}/${OS_REL}/cloud" >> $GITHUB_ENV
;;
esac
env:
MATRIX_IMAGE: ${{ matrix.image }}
- name: Download package
uses: actions/download-artifact@v2
with:
name: ${{ matrix.pkg }}_${{ env.OS_NAME }}_${{ env.OS_REL }}
name: ${{ matrix.pkg }}_${{ env.OS_NAME }}_${{ env.OS_REL }}_${{ matrix.target }}
- name: Add current user to LXD group
run: |