From d7e7960bc16353834b9776e64700fb2f68ea713f Mon Sep 17 00:00:00 2001 From: HenriWahl <2835065+HenriWahl@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:59:07 +0200 Subject: [PATCH 1/2] prepare 3.16.2 --- .github/workflows/build-release-latest.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml index 0d46f7e1..c7d5eb76 100644 --- a/.github/workflows/build-release-latest.yml +++ b/.github/workflows/build-release-latest.yml @@ -383,6 +383,12 @@ jobs: pattern: 'fedora*' path: artifact merge-multiple: true + # docker login is needed for pushing the build image + - uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} # organize SSH deploy key for nagstamon-repo - run: mkdir ~/.ssh - run: echo "${{ secrets.NAGSTAMON_REPO_KEY_WEB }}" > ~/.ssh/id_ed25519 @@ -391,6 +397,9 @@ jobs: - run: git clone git@github.com:HenriWahl/nagstamon-jekyll.git - run: rm -rf ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} - run: mkdir -p ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} + # if image defined by variable cr_image_version is not pullable aka does not exist it will be created and pushed + - run: docker pull ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} || /usr/bin/docker build -t ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} -f build/docker/Dockerfile-${{ github.job }} . + - run: docker push ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} # copy *.rpm files into nagstamon-jekyll and create repodata - run: | version=${{ env.release }} && \ From 4a53e98b9cf69cbdb3b3836ae1ad67fb04d9bb76 Mon Sep 17 00:00:00 2001 From: HenriWahl <2835065+HenriWahl@users.noreply.github.com> Date: Thu, 24 Oct 2024 23:14:10 +0200 Subject: [PATCH 2/2] prepare 3.16.2 --- .github/workflows/build-release-stable.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build-release-stable.yml b/.github/workflows/build-release-stable.yml index 057cfe08..a1410047 100644 --- a/.github/workflows/build-release-stable.yml +++ b/.github/workflows/build-release-stable.yml @@ -379,6 +379,12 @@ jobs: pattern: 'fedora*' path: artifact merge-multiple: true + # docker login is needed for pushing the build image + - uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} # organize SSH deploy key for nagstamon-repo - run: mkdir ~/.ssh - run: echo "${{ secrets.NAGSTAMON_REPO_KEY_WEB }}" > ~/.ssh/id_ed25519 @@ -386,6 +392,9 @@ jobs: # get and prepare nagstamon-jekyll - run: git clone git@github.com:HenriWahl/nagstamon-jekyll.git - run: rm -rf ${{ env.repo_dir }}/${{ env.family }}/?? + # if image defined by variable cr_image_version is not pullable aka does not exist it will be created and pushed + - run: docker pull ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} || /usr/bin/docker build -t ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} -f build/docker/Dockerfile-${{ github.job }} . + - run: docker push ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} # copy *.rpm files into nagstamon-jekyll and create repodata - run: | for noarch_rpm in artifact/*${{ env.family }}*.noarch.rpm; \