diff options
| author | Sviatoslav Sydorenko (Святослав Сидоренко) <wk@sydorenko.org.ua> | 2024-09-13 20:18:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-13 20:18:19 +0200 |
| commit | a9b0d9f2e522b02e8b16486e61ecdaeb9542f1d0 (patch) | |
| tree | bf9dfa3bd017eaf5d84ba39ce465d077fae12ad2 /.github/actions/awx_devel_image/action.yml | |
| parent | Replace `pkg_resources` with `importlib.metadata` (#15441) (diff) | |
| download | awx-a9b0d9f2e522b02e8b16486e61ecdaeb9542f1d0.tar.xz awx-a9b0d9f2e522b02e8b16486e61ecdaeb9542f1d0.zip | |
🧪🚑 Fix fetching the CI image on merges (#15509)
Diffstat (limited to '')
| -rw-r--r-- | .github/actions/awx_devel_image/action.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/actions/awx_devel_image/action.yml b/.github/actions/awx_devel_image/action.yml index 79af30dae1..4ad99f71de 100644 --- a/.github/actions/awx_devel_image/action.yml +++ b/.github/actions/awx_devel_image/action.yml @@ -24,11 +24,11 @@ runs: - name: Pre-pull latest devel image to warm cache shell: bash - run: docker pull -q ghcr.io/${OWNER_LC}/awx_devel:${{ github.base_ref }} + run: docker pull -q ghcr.io/${OWNER_LC}/awx_devel:${{ github.base_ref || github.ref_name }} - name: Build image for current source checkout shell: bash run: | DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \ - COMPOSE_TAG=${{ github.base_ref }} \ + COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \ make docker-compose-build |