From c3936cbbe3851f376df2b8edc3ac65ec20e181b8 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 1 Feb 2024 18:39:28 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Temporary=20hack=20to=20correctly=20tag=20t?= =?UTF-8?q?he=20security=20docker=20image=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml index e96d55e461..6683ef4727 100644 --- a/.github/workflows/build-security.yml +++ b/.github/workflows/build-security.yml @@ -14,7 +14,7 @@ jobs: env: TZ: Etc/UTC run: | - echo mastodon_version_prerelease=nightly.$(date --date='next day' +'%Y-%m-%d')-security>> $GITHUB_OUTPUT + echo mastodon_version_prerelease=nightly.2024-02-02-security>> $GITHUB_OUTPUT outputs: prerelease: ${{ steps.version_vars.outputs.mastodon_version_prerelease }} From 5bc39b3196db8c79719c5a6c920c780284b8266a Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 1 Feb 2024 20:30:35 +0100 Subject: [PATCH 2/2] Fix build-security docker tags --- .github/workflows/build-security.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml index 6683ef4727..e9f1862f5d 100644 --- a/.github/workflows/build-security.yml +++ b/.github/workflows/build-security.yml @@ -14,7 +14,7 @@ jobs: env: TZ: Etc/UTC run: | - echo mastodon_version_prerelease=nightly.2024-02-02-security>> $GITHUB_OUTPUT + echo mastodon_version_prerelease=nightly.$(date --date='next day' +'%Y-%m-%d')-security>> $GITHUB_OUTPUT outputs: prerelease: ${{ steps.version_vars.outputs.mastodon_version_prerelease }} @@ -36,7 +36,7 @@ jobs: tags: | type=raw,value=edge type=raw,value=nightly - type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }} + type=raw,value=${{ needs.compute-suffix.outputs.prerelease }} secrets: inherit build-image-streaming: @@ -57,5 +57,5 @@ jobs: tags: | type=raw,value=edge type=raw,value=nightly - type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }} + type=raw,value=${{ needs.compute-suffix.outputs.prerelease }} secrets: inherit