From f2283aa2cf7f0a1392fc6ce5d9e069fa4107d425 Mon Sep 17 00:00:00 2001 From: micah <42517495+catgoat@users.noreply.github.com> Date: Sun, 20 Nov 2022 19:54:09 -0500 Subject: [PATCH 1/2] Delete docker-image.yml --- .github/workflows/docker-image.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index c4db830295ffdd..00000000000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ glitch-branch ] - pull_request: - branches: [ glitch-branch ] - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From 9cb7cb3dfa1d68c2e88e87046bfcbf94df1529d3 Mon Sep 17 00:00:00 2001 From: micah <42517495+catgoat@users.noreply.github.com> Date: Sun, 20 Nov 2022 20:01:06 -0500 Subject: [PATCH 2/2] Update build-image.yml --- .github/workflows/build-image.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 3a880fabf278c3..b69a5e5ce958f8 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -1,13 +1,7 @@ name: Build container image on: - workflow_dispatch: - push: - branches: - - 'main' - pull_request: - paths: - - .github/workflows/build-image.yml - - Dockerfile + release: + types: [published, edited] permissions: contents: read packages: write @@ -30,8 +24,8 @@ jobs: with: images: ghcr.io/${{ github.repository_owner }}/mastodon tags: | - type=raw,value=latest,enable={{is_default_branch}} - type=edge,branch=main + type=raw,value=latest + type=edge,branch=meemu type=sha,prefix=,format=long - uses: docker/build-push-action@v3 with: