From 64b92422e39708a107e91f1358646bd3d35bb84a Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 2 Feb 2024 19:09:14 +0100 Subject: [PATCH 01/15] fix(ci): fix delivery condition (#1108) --- .github/actions/delivery/action.yml | 2 +- .github/actions/promote-to-stable/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/delivery/action.yml b/.github/actions/delivery/action.yml index 757034c9c60..66ed19e6db8 100644 --- a/.github/actions/delivery/action.yml +++ b/.github/actions/delivery/action.yml @@ -31,7 +31,7 @@ runs: - name: Build name for DEB shell: bash - if: ${{ contains(fromJSON('["bullseye", "bookworm", "jammy"]' , inputs.distrib) }} + if: ${{ contains(fromJSON('["bullseye", "bookworm", "jammy"]'), inputs.distrib) }} run: | echo "extfile=deb" >> $GITHUB_ENV diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml index 54eba4d3b13..dfb7f6af133 100644 --- a/.github/actions/promote-to-stable/action.yml +++ b/.github/actions/promote-to-stable/action.yml @@ -78,7 +78,7 @@ runs: shell: bash - name: Promote DEB packages to stable - if: ${{ contains(fromJSON('["bullseye", "bookworm"]' , inputs.distrib) }} + if: ${{ contains(fromJSON('["bullseye", "bookworm"]'), inputs.distrib) }} run: | echo "[DEBUG] - Major version: ${{ inputs.major_version }}" echo "[DEBUG] - Minor version: ${{ inputs.minor_version }}" From ef3af826bf0aeb209f3116bf569f57452c701554 Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Tue, 6 Feb 2024 10:39:39 +0100 Subject: [PATCH 02/15] add github action for libzmq --- .github/workflows/zmq-lib.yml | 176 ++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 .github/workflows/zmq-lib.yml diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml new file mode 100644 index 00000000000..8c00f20210d --- /dev/null +++ b/.github/workflows/zmq-lib.yml @@ -0,0 +1,176 @@ +name: libzmq + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +on: + workflow_dispatch: + pull_request: + paths: + - '.github/workflows/zmq-lib.yml' + push: + branches: + - develop + - dev-[2-9][0-9].[0-9][0-9].x + - master + - "[2-9][0-9].[0-9][0-9].x" + paths: + - '.github/workflows/zmq-lib.yml' + +jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version_file: centreon-gorgone/.version + + package-rpm: + needs: [get-version] + + strategy: + fail-fast: false + matrix: + include: + - image: packaging-nfpm-alma8 + distrib: el8 + - image: packaging-nfpm-alma9 + distrib: el9 + + runs-on: ubuntu-22.04 + + container: + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-version.outputs.major_version }} + credentials: + username: ${{ secrets.DOCKER_REGISTRY_ID }} + password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} + + name: package ${{ matrix.distrib }} + + steps: + - name: package rpm + run: | + dnf install -y wget rpmdevtools rpmlint epel-release + dnf config-manager --set-enabled crb || true # alma 9 + dnf config-manager --set-enabled powertools || true # alma 8 + dnf install -y asciidoc autoconf automake gcc gcc-c++ glib2-devel libbsd-devel libtool make xmlto + cd /github/home + wget -O - https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.5.tar.gz|tar zxvf - + mkdir -p /github/home/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} + cp libzmq-4.3.5/packaging/redhat/zeromq.spec /github/home/rpmbuild/SPECS/ + wget https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz -O /github/home/rpmbuild/SOURCES/zeromq-4.3.5.tar.gz + rpmbuild -bb /github/home/rpmbuild/SPECS/zeromq.spec + shell: bash + + - name: cache rpm + uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + path: /github/home/rpmbuild/RPMS/x86_64/*.rpm + key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + + package-deb: + needs: [get-version] + + strategy: + fail-fast: false + matrix: + include: + - image: packaging-nfpm-bullseye + distrib: bullseye + - image: packaging-nfpm-bookworm + distrib: bookworm + - image: packaging-nfpm-jammy + distrib: jammy + + runs-on: ubuntu-22.04 + + container: + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-version.outputs.major_version }} + credentials: + username: ${{ secrets.DOCKER_REGISTRY_ID }} + password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} + + name: package ${{ matrix.distrib }} + + steps: + - name: package deb + run: | + apt-get install -y dpkg-dev wget + cd /github/home + wget -O - https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz|tar zxvf - + cd zeromq-4.3.5 + ./configure + make + make install + cd /github/home + wget -O - https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.5.tar.gz|tar zxvf - + cd libzmq-4.3.5 + apt-get install -y debhelper dh-autoreconf libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc xmlto + ln -s packaging/debian + dpkg-buildpackage -us -uc -nc + shell: bash + + - name: cache deb + uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + path: /github/home/*.deb + key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} + + deliver-rpm: + runs-on: [self-hosted, common] + needs: [get-version, package-rpm] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-version.outputs.stability) }} + + strategy: + matrix: + distrib: [el8, el9] + + steps: + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: libzmq + distrib: ${{ matrix.distrib }} + version: ${{ needs.get-version.outputs.major_version }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-version.outputs.stability }} + + deliver-deb: + runs-on: [self-hosted, common] + needs: [get-version, package-deb] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-version.outputs.stability) }} + + strategy: + matrix: + distrib: [bullseye, bookworm] + + steps: + - name: Delivery + uses: ./.github/actions/deb-delivery + with: + module_name: libzmq + distrib: ${{ matrix.distrib }} + version: ${{ needs.get-version.outputs.major_version }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} + stability: ${{ needs.get-version.outputs.stability }} + + promote: + needs: [get-version] + if: ${{ contains(fromJson('["stable"]'), needs.get-version.outputs.stability) && github.event_name != 'workflow_dispatch' }} + runs-on: [self-hosted, common] + strategy: + matrix: + distrib: [el8, el9, bullseye, bookworm, jammy] + + steps: + - name: Promote ${{ matrix.distrib }} to stable + uses: ./.github/actions/promote-to-stable + with: + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + module: libzmq + distrib: ${{ matrix.distrib }} + major_version: ${{ needs.get-version.outputs.major_version }} + minor_version: ${{ needs.get-version.outputs.minor_version }} + stability: ${{ needs.get-version.outputs.stability }} + github_base_ref: ${{ github.base_ref }} From adfceb43d5376b22effb267ccb2a09546e2712ac Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Tue, 6 Feb 2024 10:52:50 +0100 Subject: [PATCH 03/15] fix --- .github/workflows/zmq-lib.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 8c00f20210d..72728b6ecd1 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -21,8 +21,6 @@ on: jobs: get-version: uses: ./.github/workflows/get-version.yml - with: - version_file: centreon-gorgone/.version package-rpm: needs: [get-version] @@ -130,7 +128,7 @@ jobs: with: module_name: libzmq distrib: ${{ matrix.distrib }} - version: ${{ needs.get-version.outputs.major_version }} + version: ${{ needs.get-version.outputs.version }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} stability: ${{ needs.get-version.outputs.stability }} @@ -150,7 +148,7 @@ jobs: with: module_name: libzmq distrib: ${{ matrix.distrib }} - version: ${{ needs.get-version.outputs.major_version }} + version: ${{ needs.get-version.outputs.version }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} stability: ${{ needs.get-version.outputs.stability }} @@ -168,9 +166,9 @@ jobs: uses: ./.github/actions/promote-to-stable with: artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - module: libzmq + module_name: libzmq distrib: ${{ matrix.distrib }} - major_version: ${{ needs.get-version.outputs.major_version }} - minor_version: ${{ needs.get-version.outputs.minor_version }} + major_version: ${{ needs.get-version.outputs.version }} + minor_version: ${{ needs.get-version.outputs.patch }} stability: ${{ needs.get-version.outputs.stability }} github_base_ref: ${{ github.base_ref }} From e7e7e3893cc71971fce93349517f2950b6ddfa29 Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Tue, 6 Feb 2024 11:17:52 +0100 Subject: [PATCH 04/15] fix --- .github/workflows/zmq-lib.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 72728b6ecd1..299e5d59c00 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-22.04 container: - image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-version.outputs.major_version }} + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-version.outputs.version }} credentials: username: ${{ secrets.DOCKER_REGISTRY_ID }} password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-22.04 container: - image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-version.outputs.major_version }} + image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-version.outputs.version }} credentials: username: ${{ secrets.DOCKER_REGISTRY_ID }} password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} @@ -171,4 +171,5 @@ jobs: major_version: ${{ needs.get-version.outputs.version }} minor_version: ${{ needs.get-version.outputs.patch }} stability: ${{ needs.get-version.outputs.stability }} + repository_name: standard github_base_ref: ${{ github.base_ref }} From c588aaf75ce21f677c65b83814b50cfac08ebf00 Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Tue, 6 Feb 2024 11:53:33 +0100 Subject: [PATCH 05/15] update --- .github/workflows/zmq-lib.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 299e5d59c00..5d250ead733 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -92,6 +92,7 @@ jobs: steps: - name: package deb run: | + apt-get update apt-get install -y dpkg-dev wget cd /github/home wget -O - https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz|tar zxvf - From 69b0f8cc2917a7b7945803b26057aa057f881e6d Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Wed, 7 Feb 2024 10:13:02 +0100 Subject: [PATCH 06/15] use centreon-collect github actions for delivery + add bullseye arm64 --- .github/workflows/zmq-lib.yml | 74 ++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 5d250ead733..b915bffd1d5 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -29,10 +29,12 @@ jobs: fail-fast: false matrix: include: - - image: packaging-nfpm-alma8 + - image: packaging-alma8 distrib: el8 - - image: packaging-nfpm-alma9 + arch: amd64 + - image: packaging-alma9 distrib: el9 + arch: amd64 runs-on: ubuntu-22.04 @@ -57,13 +59,14 @@ jobs: cp libzmq-4.3.5/packaging/redhat/zeromq.spec /github/home/rpmbuild/SPECS/ wget https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz -O /github/home/rpmbuild/SOURCES/zeromq-4.3.5.tar.gz rpmbuild -bb /github/home/rpmbuild/SPECS/zeromq.spec + shell: bash - name: cache rpm uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: /github/home/rpmbuild/RPMS/x86_64/*.rpm - key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + key: ${{ github.run_id }}-${{ github.sha }}-rpm-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} package-deb: needs: [get-version] @@ -72,14 +75,24 @@ jobs: fail-fast: false matrix: include: - - image: packaging-nfpm-bullseye + - image: packaging-bullseye distrib: bullseye - - image: packaging-nfpm-bookworm + runner: ubuntu-22.04 + arch: amd64 + - image: packaging-bookworm distrib: bookworm + runner: ubuntu-22.04 + arch: amd64 - image: packaging-nfpm-jammy distrib: jammy + runner: ubuntu-22.04 + arch: amd64 + - image: packaging-bullseye-arm64 + distrib: bullseye + runner: ["self-hosted", "collect-arm64"] + arch: arm64 - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.runner }} container: image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:${{ needs.get-version.outputs.version }} @@ -87,13 +100,14 @@ jobs: username: ${{ secrets.DOCKER_REGISTRY_ID }} password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} - name: package ${{ matrix.distrib }} + name: package ${{ matrix.distrib }} ${{ matrix.arch }} steps: - name: package deb run: | apt-get update apt-get install -y dpkg-dev wget + apt-get install -y debhelper dh-autoreconf libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc xmlto cd /github/home wget -O - https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz|tar zxvf - cd zeromq-4.3.5 @@ -112,46 +126,62 @@ jobs: uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: /github/home/*.deb - key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} + key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} deliver-rpm: - runs-on: [self-hosted, common] + if: ${{ contains(fromJson('["testing", "stable"]'), needs.get-version.outputs.stability) }} needs: [get-version, package-rpm] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-version.outputs.stability) }} - + environment: ${{ needs.get-version.outputs.environment }} + runs-on: [self-hosted, common] strategy: matrix: - distrib: [el8, el9] + include: + - distrib: el8 + arch: amd64 + - distrib: el9 + arch: amd64 + + name: deliver ${{ matrix.distrib }} steps: - - name: Delivery - uses: ./.github/actions/rpm-delivery + - name: Publish RPM packages + uses: ./.github/actions/delivery with: module_name: libzmq distrib: ${{ matrix.distrib }} version: ${{ needs.get-version.outputs.version }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + cache_key: ${{ github.run_id }}-${{ github.sha }}-rpm-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} stability: ${{ needs.get-version.outputs.stability }} deliver-deb: - runs-on: [self-hosted, common] + if: ${{ contains(fromJson('["testing", "stable"]'), needs.get-version.outputs.stability) }} needs: [get-version, package-deb] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-version.outputs.stability) }} - + environment: ${{ needs.get-version.outputs.environment }} + runs-on: [self-hosted, common] strategy: matrix: - distrib: [bullseye, bookworm] + include: + - distrib: bullseye + arch: amd64 + - distrib: bullseye + arch: arm64 + - distrib: bookworm + arch: amd64 + - distrib: jammy + arch: amd64 + + name: deliver ${{ matrix.distrib }} steps: - - name: Delivery - uses: ./.github/actions/deb-delivery + - name: Publish DEB packages + uses: ./.github/actions/delivery with: module_name: libzmq distrib: ${{ matrix.distrib }} version: ${{ needs.get-version.outputs.version }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} + cache_key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} stability: ${{ needs.get-version.outputs.stability }} promote: From b466ce927ca56c25ce1ed379cf0d855d8a276d7b Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Thu, 8 Feb 2024 10:24:22 +0100 Subject: [PATCH 07/15] try to fix path problem --- .github/workflows/zmq-lib.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index b915bffd1d5..1080ab76c05 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -59,13 +59,14 @@ jobs: cp libzmq-4.3.5/packaging/redhat/zeromq.spec /github/home/rpmbuild/SPECS/ wget https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz -O /github/home/rpmbuild/SOURCES/zeromq-4.3.5.tar.gz rpmbuild -bb /github/home/rpmbuild/SPECS/zeromq.spec - + cd - + mv /github/home/rpmbuild/RPMS/x86_64/*.rpm ./ shell: bash - name: cache rpm uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: - path: /github/home/rpmbuild/RPMS/x86_64/*.rpm + path: ./*.rpm key: ${{ github.run_id }}-${{ github.sha }}-rpm-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} package-deb: @@ -120,12 +121,14 @@ jobs: apt-get install -y debhelper dh-autoreconf libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc xmlto ln -s packaging/debian dpkg-buildpackage -us -uc -nc + cd - + mv /github/home/*.deb ./ shell: bash - name: cache deb uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: - path: /github/home/*.deb + path: ./*.deb key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} deliver-rpm: From ca740e283fbe5c613c20f760fdc25efab20d083d Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Thu, 8 Feb 2024 10:37:14 +0100 Subject: [PATCH 08/15] fix --- .github/workflows/zmq-lib.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 1080ab76c05..067058e04d9 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -121,8 +121,6 @@ jobs: apt-get install -y debhelper dh-autoreconf libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc xmlto ln -s packaging/debian dpkg-buildpackage -us -uc -nc - cd - - mv /github/home/*.deb ./ shell: bash - name: cache deb From e658facd153b1954737d63fa89386dffeff4df9d Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Thu, 8 Feb 2024 10:50:30 +0100 Subject: [PATCH 09/15] update --- .github/workflows/zmq-lib.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 067058e04d9..8410b4393c6 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -109,18 +109,18 @@ jobs: apt-get update apt-get install -y dpkg-dev wget apt-get install -y debhelper dh-autoreconf libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc xmlto - cd /github/home wget -O - https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz|tar zxvf - cd zeromq-4.3.5 ./configure make make install - cd /github/home + cd .. wget -O - https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.5.tar.gz|tar zxvf - cd libzmq-4.3.5 apt-get install -y debhelper dh-autoreconf libkrb5-dev libnorm-dev libpgm-dev libsodium-dev libunwind8-dev libnss3-dev libgnutls28-dev libbsd-dev pkg-config asciidoc xmlto ln -s packaging/debian dpkg-buildpackage -us -uc -nc + cd .. shell: bash - name: cache deb From 2621cd2cbb9cfe9417541c3899e33a36d3a2fe7d Mon Sep 17 00:00:00 2001 From: sdepassio <114986849+sdepassio@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:55:30 +0100 Subject: [PATCH 10/15] Update .github/workflows/zmq-lib.yml Co-authored-by: Kevin Duret --- .github/workflows/zmq-lib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 8410b4393c6..d8f3cfcfe76 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -130,7 +130,7 @@ jobs: key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} deliver-rpm: - if: ${{ contains(fromJson('["testing", "stable"]'), needs.get-version.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-version.outputs.stability) }} needs: [get-version, package-rpm] environment: ${{ needs.get-version.outputs.environment }} runs-on: [self-hosted, common] From 086e8e4f068ea0d03ab78dd62a43b530212b81c1 Mon Sep 17 00:00:00 2001 From: sdepassio <114986849+sdepassio@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:55:45 +0100 Subject: [PATCH 11/15] Update .github/workflows/zmq-lib.yml Co-authored-by: Kevin Duret --- .github/workflows/zmq-lib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index d8f3cfcfe76..cf4d37950a1 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -156,7 +156,7 @@ jobs: stability: ${{ needs.get-version.outputs.stability }} deliver-deb: - if: ${{ contains(fromJson('["testing", "stable"]'), needs.get-version.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-version.outputs.stability) }} needs: [get-version, package-deb] environment: ${{ needs.get-version.outputs.environment }} runs-on: [self-hosted, common] From 53c7ea399434c6e8fe9aa214d17ba97020913972 Mon Sep 17 00:00:00 2001 From: sdepassio <114986849+sdepassio@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:47:06 +0100 Subject: [PATCH 12/15] Update .github/workflows/zmq-lib.yml Co-authored-by: Kevin Duret --- .github/workflows/zmq-lib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index cf4d37950a1..df99edc1d81 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -182,7 +182,7 @@ jobs: distrib: ${{ matrix.distrib }} version: ${{ needs.get-version.outputs.version }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - cache_key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }} stability: ${{ needs.get-version.outputs.stability }} promote: From 9ede6e8334694e41a55a43a2c8c61948b96364f8 Mon Sep 17 00:00:00 2001 From: sdepassio <114986849+sdepassio@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:47:16 +0100 Subject: [PATCH 13/15] Update .github/workflows/zmq-lib.yml Co-authored-by: Kevin Duret --- .github/workflows/zmq-lib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index df99edc1d81..261c3fc465e 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -152,7 +152,7 @@ jobs: distrib: ${{ matrix.distrib }} version: ${{ needs.get-version.outputs.version }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - cache_key: ${{ github.run_id }}-${{ github.sha }}-rpm-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: ${{ github.run_id }}-${{ github.sha }}-rpm-libzmq-${{ matrix.distrib }}-${{ matrix.arch }} stability: ${{ needs.get-version.outputs.stability }} deliver-deb: From 95fa18456f20df17d6eef33010de4547a3631ff6 Mon Sep 17 00:00:00 2001 From: sdepassio <114986849+sdepassio@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:47:22 +0100 Subject: [PATCH 14/15] Update .github/workflows/zmq-lib.yml Co-authored-by: Kevin Duret --- .github/workflows/zmq-lib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index 261c3fc465e..d279e795fd1 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -127,7 +127,7 @@ jobs: uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ./*.deb - key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + key: ${{ github.run_id }}-${{ github.sha }}-deb-libzmq-${{ matrix.distrib }}-${{ matrix.arch }} deliver-rpm: if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-version.outputs.stability) }} From 94a9c6e3cbef223634962991539ef0d96dc9a7af Mon Sep 17 00:00:00 2001 From: sdepassio <114986849+sdepassio@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:47:28 +0100 Subject: [PATCH 15/15] Update .github/workflows/zmq-lib.yml Co-authored-by: Kevin Duret --- .github/workflows/zmq-lib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zmq-lib.yml b/.github/workflows/zmq-lib.yml index d279e795fd1..4f82df8e509 100644 --- a/.github/workflows/zmq-lib.yml +++ b/.github/workflows/zmq-lib.yml @@ -67,7 +67,7 @@ jobs: uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ./*.rpm - key: ${{ github.run_id }}-${{ github.sha }}-rpm-libzmq-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + key: ${{ github.run_id }}-${{ github.sha }}-rpm-libzmq-${{ matrix.distrib }}-${{ matrix.arch }} package-deb: needs: [get-version]