diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2024-10-13 14:53:35 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-10-13 14:53:35 +0200 |
| commit | 86fb00da10a9a1af006b82b4842fcc11f06b9232 (patch) | |
| tree | 253aea323bb4243dd7b3838a79ce7569e567b743 | |
| parent | [chore/bugfix] goreleaser make previous_tag cmd busybox-compatible (#3423) (diff) | |
| download | gotosocial-86fb00da10a9a1af006b82b4842fcc11f06b9232.tar.xz | |
[chore] Ensure current tag not set as `GORELEASER_PREVIOUS_TAG` (#3424)
* [chore] Ensure current tag not set as `GORELEASER_PREVIOUS_TAG`
* tweak tweak
| -rw-r--r-- | .drone.yml | 16 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/.drone.yml b/.drone.yml index 11be6c256..589c20b24 100644 --- a/.drone.yml +++ b/.drone.yml @@ -113,7 +113,7 @@ steps: commands: # Create a snapshot build with GoReleaser. - git fetch --tags - - GORELEASER_PREVIOUS_TAG=$(git tag -l | grep -v rc | sort -V -r | head -n 1) goreleaser release --clean --snapshot + - goreleaser release --clean --snapshot # Login to Docker, push Docker image snapshots + manifests. - /go/dockerlogin.sh @@ -156,7 +156,17 @@ steps: commands: - git fetch --tags - /go/dockerlogin.sh - - GORELEASER_PREVIOUS_TAG=$(git tag -l | grep -v rc | sort -V -r | head -n 1) goreleaser release --clean + + # When releasing, compare commits to the most recent tag that is not the + # current one AND is not a release candidate tag (ie., no "rc" in the name). + # + # The DRONE_TAG env var should point to the tag that triggered this build. + # See: https://docs.drone.io/pipeline/environment/reference/drone-tag/ + # + # Note, this may cause annoyances when doing backport releases, for example, + # releasing v0.10.1 when we've already released v0.15.0 or whatever, but + # they should only be superficial annoyances related to the release notes. + - GORELEASER_PREVIOUS_TAG=$(git tag -l | grep -v "rc\|${DRONE_TAG}" | sort -V -r | head -n 1) goreleaser release --clean when: event: include: @@ -213,6 +223,6 @@ steps: --- kind: signature -hmac: 3f2066e1e1f7f05b7cdb51327d6c9aea5d06a3dbceb518421110d9c1c3b325f8 +hmac: 1b89e3a538fbca72eb9a0b398cd82f09a774ba3649013e19d36012eda327e83f ... diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 37b2608bb..0a7a14544 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -195,7 +195,7 @@ Then install Node and Yarn as described in [Stylesheet / Web dev](#stylesheet--w Finally, to create a snapshot build, do: ```bash -GORELEASER_PREVIOUS_TAG=$(git tag -l | grep -v rc | sort -V -r | head -n 1) goreleaser --clean --snapshot +goreleaser release --clean --snapshot ``` If all goes according to plan, you should now have a number of multiple-architecture binaries and tars inside the `./dist` folder, and snapshot Docker images should be built (check your terminal output for version). |