diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2022-02-07 20:07:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-07 20:07:48 +0000 |
commit | 918fa1ea9e4f62e82413d726d21fd005a38d966a (patch) | |
tree | 19bf7f0ec8ca3d6d4f6267f8cfb762e20e8d0063 /.gitlab-ci.yml | |
parent | Merge pull request #4911 from netblue30/ci_changelog (diff) | |
parent | CI: drop hostnames workaround (diff) | |
download | firejail-918fa1ea9e4f62e82413d726d21fd005a38d966a.tar.gz firejail-918fa1ea9e4f62e82413d726d21fd005a38d966a.tar.zst firejail-918fa1ea9e4f62e82413d726d21fd005a38d966a.zip |
Merge pull request #4912 from netblue30/ci_centos
CI: replace centos (EOL) with almalinux
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9fe768ff..e79028c4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -21,7 +21,7 @@ build_debian_package: | |||
21 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 21 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb |
22 | 22 | ||
23 | build_redhat_package: | 23 | build_redhat_package: |
24 | image: centos:latest | 24 | image: almalinux:latest |
25 | script: | 25 | script: |
26 | - dnf update -y | 26 | - dnf update -y |
27 | - dnf install -y rpm-build gcc make | 27 | - dnf install -y rpm-build gcc make |
@@ -67,8 +67,6 @@ debian_ci: | |||
67 | - cd $CI_PROJECT_DIR/.. && (apt-get source --download-only -t experimental firejail || apt-get source --download-only firejail) | 67 | - cd $CI_PROJECT_DIR/.. && (apt-get source --download-only -t experimental firejail || apt-get source --download-only firejail) |
68 | - cd $CI_PROJECT_DIR && tar xf ../firejail_*.debian.tar.* | 68 | - cd $CI_PROJECT_DIR && tar xf ../firejail_*.debian.tar.* |
69 | - rm -rf debian/patches/ | 69 | - rm -rf debian/patches/ |
70 | # /etc/firejail/hostnames is no longer installed | ||
71 | - sed '/etc\/firejail\/hostnames/d' -i debian/firejail.install | ||
72 | - VERSION=$(grep ^PACKAGE_VERSION= configure | cut -d"'" -f2) && dch -v ${VERSION}-0.1~ci "Non-maintainer upload." && git archive -o ../firejail_${VERSION}.orig.tar.gz HEAD && pristine-tar commit ../firejail_${VERSION}.orig.tar.gz ci_build && git branch -m pristine-tar origin/pristine-tar | 70 | - VERSION=$(grep ^PACKAGE_VERSION= configure | cut -d"'" -f2) && dch -v ${VERSION}-0.1~ci "Non-maintainer upload." && git archive -o ../firejail_${VERSION}.orig.tar.gz HEAD && pristine-tar commit ../firejail_${VERSION}.orig.tar.gz ci_build && git branch -m pristine-tar origin/pristine-tar |
73 | - git add debian && git commit -m "add debian/" | 71 | - git add debian && git commit -m "add debian/" |
74 | - export CI_COMMIT_SHA=$(git rev-parse HEAD) | 72 | - export CI_COMMIT_SHA=$(git rev-parse HEAD) |