From 948b8fcf7d18191daea59d0a1ec98bdcde50c420 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Fri, 2 Jun 2023 13:23:11 -0400 Subject: [PATCH] Merge pull request #492 from mikedep333/fix-ci-stable-branches Fix stable branches being tagged as the current (cherry picked from commit bed07a1baaa86a9abb969c4204d96f1fec892f33) --- .github/workflows/pulp_images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml index 747564bf..b5b028f2 100644 --- a/.github/workflows/pulp_images.yml +++ b/.github/workflows/pulp_images.yml @@ -200,7 +200,7 @@ jobs: podman images -a - name: Set version and branch image tags run: | - app_version=$(podman run pulp/${{ matrix.app.image_name }}:stable bash -c "pip3 show ${{ matrix.app.pip_name }} | sed -n -e 's/Version: //p'") + app_version=$(podman run --pull=never pulp/${{ matrix.app.image_name }}:${TEMP_APP_TAG} bash -c "pip3 show ${{ matrix.app.pip_name }} | sed -n -e 's/Version: //p'") app_branch=$(echo ${app_version} | grep -oP '\d+\.\d+') echo "APP_VERSION: ${app_version}" @@ -208,7 +208,7 @@ jobs: echo "APP_VERSION=${app_version}" >> $GITHUB_ENV echo "APP_BRANCH=${app_branch}" >> $GITHUB_ENV - base_version=$(podman run pulp/${{ matrix.app.image_name }}:stable bash -c "pip3 show pulpcore | sed -n -e 's/Version: //p'") + base_version=$(podman run --pull=never pulp/${{ matrix.app.image_name }}:${TEMP_APP_TAG} bash -c "pip3 show pulpcore | sed -n -e 's/Version: //p'") base_branch=$(echo ${base_version} | grep -oP '\d+\.\d+') echo "BASE_VERSION: ${base_version}"