From f2584783954387208254a6405343b217af7e0c37 Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Fri, 5 May 2023 09:58:35 -0700
Subject: [PATCH] Fixed mastodon version injection into containers via github
actions (#24873)
---
.github/workflows/build-image.yml | 2 +-
.github/workflows/build-nightly.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 6225c7469..982031c9d 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -61,7 +61,7 @@ jobs:
id: version_vars
if: github.repository == 'mastodon/mastodon' && github.event_name == 'push' && github.ref_name == 'main'
run: |
- echo mastodon_version_suffix=\"+edge-$(git rev-parse --short HEAD)\" >> $GITHUB_OUTPUT
+ echo mastodon_version_suffix=+edge-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
- uses: docker/build-push-action@v4
with:
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index e765315d0..f07f7447c 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -44,7 +44,7 @@ jobs:
- name: Generate version suffix
id: version_vars
run: |
- echo mastodon_version_suffix=\"+nightly-$(date +'%Y%m%d')\" >> $GITHUB_OUTPUT
+ echo mastodon_version_suffix=+nightly-$(date +'%Y%m%d') >> $GITHUB_OUTPUT
- uses: docker/build-push-action@v4
with: