summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-07-23 09:19:24 +0100
committerErik Johnston <erik@matrix.org>2021-07-23 09:19:24 +0100
commitab82fd6ed117d65b330648727dd262b88c94215c (patch)
tree52c3d57939ac2f7e08aec98c9f29160287eddc35
parentMerge tag 'v1.39.0rc2' into develop (diff)
parentMerge tag 'v1.38.1' into release-v1.39 (diff)
downloadsynapse-ab82fd6ed117d65b330648727dd262b88c94215c.tar.xz
Merge branch 'release-v1.39' into develop
-rw-r--r--.github/workflows/docker.yml2
-rw-r--r--changelog.d/10461.misc1
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml

index 8bdefb3905..af7ed21fce 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml
@@ -54,7 +54,7 @@ jobs: # we do an amd64-only build, before following up with a multiarch build. - name: Build and push amd64 uses: docker/build-push-action@v2 - if: "${{ startsWith(github.ref, 'refs/tags/v' }}" + if: "${{ startsWith(github.ref, 'refs/tags/v') }}" with: push: true labels: "gitsha1=${{ github.sha }}" diff --git a/changelog.d/10461.misc b/changelog.d/10461.misc new file mode 100644
index 0000000000..5035e26825 --- /dev/null +++ b/changelog.d/10461.misc
@@ -0,0 +1 @@ +Fix an error which prevented the Github Actions workflow to build the docker images from running.