ci: only add commit suffix to linux packages for branch/PR builds

cmd/agent_local/package/linux/nfpm.yaml

@@ -2,7 +2,7 @@
 name: "authentik-agent"
 arch: "${ARCH}"
 platform: "linux"
-version: "${VERSION}+ak-${VERSION_HASH_SHORT}"
+version: "${VERSION_PKG}"
 description: |
   authentik Agent
 vendor: "Authentik Security Inc."

cmd/agent_system/Makefile

@@ -37,5 +37,5 @@ package-gnu/linux: build
 	$(call nfpm_package,${TOP}/cmd/${TARGET}/package/linux/nfpm.yaml)
 
 test-deploy: package-gnu/linux
-	$(TME) dpkg -i /workspaces/bin/${TARGET}/authentik-sysd_${VERSION}+ak-${VERSION_HASH_SHORT}_${ARCH}.deb
+	$(TME) dpkg -i /workspaces/bin/${TARGET}/authentik-sysd_${VERSION}+_${ARCH}.deb
 	$(TME) systemctl restart ak-sysd

cmd/agent_system/package/linux/nfpm.yaml

@@ -2,7 +2,7 @@
 name: "authentik-sysd"
 arch: "${ARCH}"
 platform: "linux"
-version: "${VERSION}+ak-${VERSION_HASH_SHORT}"
+version: "${VERSION_PKG}"
 description: |
   authentik System Agent
 vendor: "Authentik Security Inc."

cmd/cli/Makefile

@@ -32,6 +32,6 @@ package-gnu/linux: build
 	$(call nfpm_package,${TOP}/cmd/${TARGET}/package/linux/nfpm.yaml)
 
 test-deploy: package-gnu/linux
-	$(TME) dpkg -i /workspaces/bin/${TARGET}/authentik-${TARGET}_${VERSION}+ak-${VERSION_HASH_SHORT}_${ARCH}.deb
+	$(TME) dpkg -i /workspaces/bin/${TARGET}/authentik-${TARGET}_${VERSION}+_${ARCH}.deb
 	$(TME) systemctl restart ssh
-	sudo dpkg -i ${TOP}/bin/${TARGET}/authentik-${TARGET}_${VERSION}+ak-${VERSION_HASH_SHORT}_${ARCH}.deb
+	sudo dpkg -i ${TOP}/bin/${TARGET}/authentik-${TARGET}_${VERSION}+_${ARCH}.deb

cmd/cli/package/linux/nfpm.yaml

@@ -2,7 +2,7 @@
 name: "authentik-cli"
 arch: "${ARCH}"
 platform: "linux"
-version: "${VERSION}+ak-${VERSION_HASH_SHORT}"
+version: "${VERSION_PKG}"
 description: |
   authentik CLI
 vendor: "Authentik Security Inc."

common.mk

@@ -5,8 +5,16 @@ UID = $(shell id -u)
 GID = $(shell id -g)
 VERSION = 0.43.1
 VERSION_HASH = $(shell git rev-parse HEAD)
-VERSION_HASH_SHORT = $(shell git rev-parse HEAD | head -c 8)
 VERSION_TAG = $(shell git tag --points-at HEAD)
+ifeq ($(GITHUB_ACTIONS),true)
+	ifeq ($(AK_IS_RELEASE),true)
+		VERSION_PKG = ${VERSION}
+	else
+		VERSION_PKG = ${VERSION}+ak-${shell git rev-parse HEAD | head -c 8}
+	endif
+else
+	VERSION_PKG = ${VERSION}
+endif
 VERSION_TS = $(shell date +%s)
 PLATFORM := $(shell bash -c "uname -o | tr '[:upper:]' '[:lower:]'")
 ifeq ($(OS),Windows_NT)
@@ -66,13 +74,13 @@ define go_generate_resources
 endef
 
 define nfpm_package
-	VERSION=${VERSION} VERSION_HASH_SHORT=${VERSION_HASH_SHORT} ARCH=${ARCH} \
+	VERSION_PKG=${VERSION_PKG} ARCH=${ARCH} \
 		go tool github.com/goreleaser/nfpm/v2/cmd/nfpm \
 			package \
 			-p deb \
 			-t ${TOP}/bin/${TARGET} \
 			-f $(1)
-	VERSION=${VERSION} VERSION_HASH_SHORT=${VERSION_HASH_SHORT} ARCH=${ARCH} \
+	VERSION_PKG=${VERSION_PKG} ARCH=${ARCH} \
 		go tool github.com/goreleaser/nfpm/v2/cmd/nfpm \
 			package \
 			-p rpm \

containers/e2e/Makefile

@@ -8,7 +8,7 @@ local-build:
 	docker build \
 		-t xghcr.io/goauthentik/platform-e2e:local \
 		--no-cache \
-		--build-arg="AK_PLATFORM_VER=${VERSION}+ak-${VERSION_HASH_SHORT}" \
+		--build-arg="AK_PLATFORM_VER=${VERSION_PKG}" \
 		--build-arg="AK_PLATFORM_ARCH=${ARCH}" \
 		-f "${PWD}/Dockerfile" \
 		${TOP}

containers/selenium/Makefile

@@ -10,7 +10,7 @@ ci-container-tag:
 
 .PHONY: ci-build-args
 ci-build-args:
-	@echo AK_PLATFORM_VER=${VERSION}+ak-${VERSION_HASH_SHORT}
+	@echo AK_PLATFORM_VER=${VERSION_PKG}
 	@echo AK_DEPLOY_URL=${AK_DEPLOY_URL}
 
 .PHONY: local-build

nss/nfpm.yaml

@@ -2,7 +2,7 @@
 name: "libnss-authentik"
 arch: "${ARCH}"
 platform: "linux"
-version: "${VERSION}+ak-${VERSION_HASH_SHORT}"
+version: "${VERSION_PKG}"
 description: |
   NSS module for authentik
 vendor: "Authentik Security Inc."

pam/nfpm.yaml

@@ -2,7 +2,7 @@
 name: "libpam-authentik"
 arch: "${ARCH}"
 platform: "linux"
-version: "${VERSION}+ak-${VERSION_HASH_SHORT}"
+version: "${VERSION_PKG}"
 description: |
   libpam-authentik authenticates users through authentik.
 vendor: "Authentik Security Inc."

vpkg/macos/Makefile

@@ -34,7 +34,7 @@ package:
 	pkgbuild \
 		--component "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}" \
 		--identifier "io.goauthentik.agent" \
-		--version "${VERSION}.${VERSION_HASH_SHORT}" \
+		--version "${VERSION}" \
 		--scripts "${PWD}/scripts" \
 		--install-location /Applications \
 		"${TOP}/bin/${TARGET}/agent.pkg"

vpkg/windows/Makefile

@@ -16,7 +16,7 @@ endif
 	dotnet restore \
 		--packages "${TOP}/cache/${TARGET}" \
 		"${PWD}/"
-	ROOT=${TOP} VERSION=${VERSION} VERSION_HASH_SHORT=${VERSION_HASH_SHORT} dotnet build \
+	ROOT=${TOP} VERSION=${VERSION} dotnet build \
 		--packages "${TOP}/cache/${TARGET}" \
 		--artifacts-path "${TOP}/cache/${TARGET}" \
 		--output "${TOP}/bin/${TARGET}" \

vpkg/windows/Package.wxs

@@ -8,7 +8,7 @@
   xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Package Id="authentik.Agent"
            Name="$(var.Name)"
-           Manufacturer="$(var.Manufacturer) ($(env.VERSION_HASH_SHORT))"
+           Manufacturer="$(var.Manufacturer)"
            Version="$(var.Version)"
            UpgradeCode="$(var.UpgradeCode)"
            Compressed="true">