From efc93d7585aea4c3ae618c7fb45a40d3bbdc9cee Mon Sep 17 00:00:00 2001 From: Torben Brenner Date: Mon, 15 Apr 2024 08:55:46 +0200 Subject: [PATCH 1/3] fix: use input.image-name for image deletion --- .github/workflows/docker-ci.yml | 2 +- .github/workflows/rust.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 45f646b..b865e8b 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -86,7 +86,7 @@ jobs: - name: Delete old images uses: snok/container-retention-policy@v2 with: - image-names: ${{ github.event.repository.name }} + image-names: ${{ inputs.image-name }} cut-off: ${{ inputs.ghcr-retention-policy }} ago UTC account-type: org org-name: samply diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 46ec8bd..a5dfd4a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -201,7 +201,7 @@ jobs: # This workflow defines how a maven package is built, tested and published. # Visit: https://github.com/samply/github-workflows/blob/develop/.github/workflows/docker-ci.yml, for more information - uses: samply/github-workflows/.github/workflows/docker-ci.yml@main + uses: samply/github-workflows/.github/workflows/docker-ci.yml@v1.4.2 with: # The Docker Hub Repository you want eventually push to, e.g samply/share-client image-name: ${{ inputs.image-prefix }}${{ matrix.components }} From 865d5995d07a21bada5f04f5f719a4e04f473e21 Mon Sep 17 00:00:00 2001 From: Torben Brenner Date: Mon, 15 Apr 2024 08:57:38 +0200 Subject: [PATCH 2/3] Changelog for 1.4.2 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b035d55..1e556b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.4.2 - 2024-04-15] +### Fixed +- Use input image name for image tag deletion ## [1.4.1 - 2024-04-11] ### Added - Always push GHCR images based on commit id, e.g. `samply/component:commit-123456` From 4ab29dd3dc1d84d77c7febe998b5c54022a7f983 Mon Sep 17 00:00:00 2001 From: lablans Date: Mon, 15 Apr 2024 09:54:42 +0000 Subject: [PATCH 3/3] Move into matrix description --- .github/workflows/docker-ci.yml | 2 +- .github/workflows/rust.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index b865e8b..d897bb8 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -78,7 +78,7 @@ on: jobs: tidy-ghcr: - name: Tidy GHCR images older than ${{ inputs.ghcr-retention-policy }} + name: Tidy GHCR images (${{ inputs.image-name }}) runs-on: ubuntu-latest if: ${{ inputs.ghcr-retention-policy != 'keep' }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a5dfd4a..fb89b35 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -201,7 +201,7 @@ jobs: # This workflow defines how a maven package is built, tested and published. # Visit: https://github.com/samply/github-workflows/blob/develop/.github/workflows/docker-ci.yml, for more information - uses: samply/github-workflows/.github/workflows/docker-ci.yml@v1.4.2 + uses: samply/github-workflows/.github/workflows/docker-ci.yml with: # The Docker Hub Repository you want eventually push to, e.g samply/share-client image-name: ${{ inputs.image-prefix }}${{ matrix.components }}