fix: run git fetch --tags --force during release (#2495)

This commit is contained in:
Dean Sheather
2022-06-19 10:39:01 +10:00
committed by GitHub
parent dc115688b8
commit 4b3608b628
2 changed files with 29 additions and 5 deletions
+27 -3
View File
@@ -27,11 +27,22 @@ env:
jobs:
linux-windows:
runs-on: ubuntu-latest
env:
# Necessary for Docker manifest
DOCKER_CLI_EXPERIMENTAL: "enabled"
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
# If the event that triggered the build was an annotated tag (which our
# tags are supposed to be), actions/checkout has a bug where the tag in
# question is only a lightweight tag and not a full annotated tag. This
# command seems to fix it.
# https://github.com/actions/checkout/issues/290
- name: Fetch git tags
run: git fetch --tags --force
- uses: actions/setup-go@v3
with:
go-version: "~1.18"
@@ -133,6 +144,14 @@ jobs:
with:
fetch-depth: 0
# If the event that triggered the build was an annotated tag (which our
# tags are supposed to be), actions/checkout has a bug where the tag in
# question is only a lightweight tag and not a full annotated tag. This
# command seems to fix it.
# https://github.com/actions/checkout/issues/290
- name: Fetch git tags
run: git fetch --tags --force
- uses: actions/setup-go@v3
with:
go-version: "~1.18"
@@ -210,14 +229,19 @@ jobs:
needs:
- linux-windows
- darwin
env:
# Necessary for Docker manifest
DOCKER_CLI_EXPERIMENTAL: "enabled"
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
# If the event that triggered the build was an annotated tag (which our
# tags are supposed to be), actions/checkout has a bug where the tag in
# question is only a lightweight tag and not a full annotated tag. This
# command seems to fix it.
# https://github.com/actions/checkout/issues/290
- name: Fetch git tags
run: git fetch --tags --force
- name: Docker Login
uses: docker/login-action@v2
with:
+2 -2
View File
@@ -28,12 +28,12 @@ if [[ "${CODER_RELEASE:-}" == *t* ]]; then
if [[ "$last_tag" != "$(git describe --always)" ]]; then
# make won't exit on $(shell cmd) failures, so we have to kill it :(
if [[ "$(ps -o comm= "$PPID" || true)" == *make* ]]; then
log "ERROR: version.sh attemped to generate a dev version string when CODER_RELEASE was set"
log "ERROR: version.sh: the current commit is not tagged with an annotated tag"
kill "$PPID" || true
exit 1
fi
error "version.sh attemped to generate a dev version string when CODER_RELEASE was set"
error "version.sh: the current commit is not tagged with an annotated tag"
fi
else
version+="-devel+$(git rev-parse --short HEAD)"