From 9db439ea199605ef14e67f8eb936c2c1f4902fda Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Tue, 8 Nov 2022 03:21:34 +0000 Subject: [PATCH 1/2] =?UTF-8?q?Sync=20repo=20templates=20=E2=9A=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sync with coreos/repo-templates@30f9d7fc373a10994edd7dc3e44bfe54e72f0719. --- .github/workflows/container-rebuild.yml | 6 ++++++ .github/workflows/container.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/container-rebuild.yml b/.github/workflows/container-rebuild.yml index 9f5c8a2e4..85df49d08 100644 --- a/.github/workflows/container-rebuild.yml +++ b/.github/workflows/container-rebuild.yml @@ -31,6 +31,12 @@ jobs: ref: ${{ github.event.inputs.git-tag }} # fetch tags so the compiled-in version number is useful fetch-depth: 0 + # If we're running on a signed tag, actions/checkout rewrites it into + # a lightweight tag (!!!) which "git describe" then ignores. Rewrite + # it back. + # https://github.com/actions/checkout/issues/290 + - name: Fix actions/checkout synthetic tag + run: git fetch --tags --force - name: Build and push container uses: coreos/actions-lib/build-container@main with: diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 23fa31b39..4840ff3e1 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -27,6 +27,12 @@ jobs: with: # fetch tags so the compiled-in version number is useful fetch-depth: 0 + # If we're running on a signed tag, actions/checkout rewrites it into + # a lightweight tag (!!!) which "git describe" then ignores. Rewrite + # it back. + # https://github.com/actions/checkout/issues/290 + - name: Fix actions/checkout synthetic tag + run: git fetch --tags --force - name: Build and push container uses: coreos/actions-lib/build-container@main with: From 12d13217437a5fab235ca4bccb3b2130403a96c0 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 7 Nov 2022 22:42:44 -0500 Subject: [PATCH 2/2] docs/release-notes: update for container version fix --- docs/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index 1e15fac93..17b2a41fb 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -27,6 +27,7 @@ nav_order: 9 - Fix reproducibility of systemd preset file in ignition-apply output - Clarify spec docs for `files`/`directories`/`links` `group` fields - Document that `user`/`group` fields aren't applied to hard links +- Fix version string in ignition-validate release container ## Ignition 2.14.0 (12-May-2022)