summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorRenaud Chaput <renchap@gmail.com>2023-05-04 13:45:39 +0200
committerGitHub <noreply@github.com>2023-05-04 13:45:39 +0200
commit830e6cefaec1777e87fa33b19cd100f04dd63323 (patch)
tree933673cd9a52ba0824a5c828a4b8a8e790ce0daa /.github
parent569b39256b00971e9416122e7f918e542e6a02b7 (diff)
Add version suffixes to nightly & edge image builds (#24823)
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build-image.yml7
-rw-r--r--.github/workflows/build-nightly.yml6
2 files changed, 13 insertions, 0 deletions
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index c0a4976b1a9..6225c746997 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -57,9 +57,16 @@ jobs:
type=pep440,pattern=v{{major}}.{{minor}}
type=ref,event=pr
+ - name: Generate version suffix
+ 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
+
- uses: docker/build-push-action@v4
with:
context: .
+ build-args: MASTODON_VERSION_SUFFIX=${{ steps.version_vars.outputs.mastodon_version_suffix }}
platforms: linux/amd64,linux/arm64
provenance: false
builder: ${{ steps.buildx.outputs.name }}
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index 501db6e9c67..e765315d05d 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -41,9 +41,15 @@ jobs:
labels: |
org.opencontainers.image.description=Nightly build image used for testing purposes
+ - name: Generate version suffix
+ id: version_vars
+ run: |
+ echo mastodon_version_suffix=\"+nightly-$(date +'%Y%m%d')\" >> $GITHUB_OUTPUT
+
- uses: docker/build-push-action@v4
with:
context: .
+ build-args: MASTODON_VERSION_SUFFIX=${{ steps.version_vars.outputs.mastodon_version_suffix }}
platforms: linux/amd64,linux/arm64
provenance: false
builder: ${{ steps.buildx.outputs.name }}