diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 11:36:25 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 19:23:58 +0200 |
| commit | cb19be67d1b47dd04cb5bb88e09f0101a614bd1c (patch) | |
| tree | 6c85ccc6ac0279ae7b1ed4dff56c8e83f71a0c95 /.github | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 8dfe5179ee7186e549dbe1186a151ffa848fe8ab (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to '.github')
| -rw-r--r-- | .github/ISSUE_TEMPLATE/1.bug_report.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/build-image.yml | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml index 9cdf813f7..cdd08d2b0 100644 --- a/.github/ISSUE_TEMPLATE/1.bug_report.yml +++ b/.github/ISSUE_TEMPLATE/1.bug_report.yml @@ -33,10 +33,24 @@ body: required: true - type: textarea attributes: + label: Detailed description + validations: + required: false + - type: textarea + attributes: label: Specifications description: | What version or commit hash of Mastodon did you find this bug in? If a front-end issue, what browser and operating systems were you using? + placeholder: | + Mastodon 3.5.3 (or Edge) + Ruby 2.7.6 (or v3.1.2) + Node.js 16.18.0 + + Google Chrome 106.0.5249.119 + Firefox 105.0.3 + + etc... validations: required: true diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 3d232120b..58c558723 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -34,7 +34,8 @@ jobs: latest=auto tags: | type=edge,branch=main - type=match,pattern=v(.*),group=0 + type=pep440,pattern={{raw}} + type=pep440,pattern=v{{major}}.{{minor}} type=ref,event=pr - uses: docker/build-push-action@v3 with: @@ -42,5 +43,5 @@ jobs: platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} - cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest + cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:edge cache-to: type=inline |