ci(release): set umask and pipefail for .deb package build

Rename the source-built AUR package from pgtidy to pgtidy-src. It
provides and conflicts with pgtidy, matching pgtidy-bin.

.gitea/workflows/release.yml

@@ -65,6 +65,13 @@ jobs:
             fi
           done
 
+      - name: Build source archives
+        run: |
+          TAG="${{ github.event.inputs.tag || github.ref_name }}"
+          PREFIX="pgtidy-${TAG#v}"
+          git archive --format=tar.gz --prefix="${PREFIX}/" -o "pgtidy-${TAG}-source.tar.gz" "$TAG"
+          git archive --format=zip    --prefix="${PREFIX}/" -o "pgtidy-${TAG}-source.zip"    "$TAG"
+
       - name: Create release and upload binaries
         run: |
           set -euo pipefail
@@ -116,6 +123,9 @@ jobs:
 
       - name: Build .deb packages
         run: |
+          set -euo pipefail
+          # Runner umask can be 000; dpkg-deb rejects group/world-writable package dirs.
+          umask 022
           VERSION="${{ github.event.inputs.tag || github.ref_name }}"
           PKGVER="${VERSION#v}"
 
@@ -255,9 +265,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   pkg-aur:
-    name: AUR package
+    name: AUR package (${{ matrix.pkg }})
     needs: release
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pkg: [pgtidy-bin, pgtidy-src]
     steps:
       - uses: actions/checkout@v4
 
@@ -268,6 +282,7 @@ jobs:
           set -euo pipefail
           VERSION="${{ github.event.inputs.tag || github.ref_name }}"
           PKGVER="${VERSION#v}"
+          PKG="${{ matrix.pkg }}"
           AUR_KEY_PATH="$HOME/.ssh/aur"
           AUR_KNOWN_HOSTS="$HOME/.ssh/known_hosts"
 
@@ -299,7 +314,7 @@ jobs:
           chmod 644 "$AUR_KNOWN_HOSTS"
 
           GIT_SSH_COMMAND="ssh -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o UserKnownHostsFile=$AUR_KNOWN_HOSTS -i $AUR_KEY_PATH" \
-            git clone ssh://aur@aur.archlinux.org/pgtidy-bin.git aur-repo
+            git clone "ssh://aur@aur.archlinux.org/${PKG}.git" aur-repo
 
           if [ -f aur-repo/PKGBUILD ]; then
             CURRENT_PKGVER=$(awk -F= '/^pkgver=/ {print $2; exit}' aur-repo/PKGBUILD | tr -d "[:space:]")
@@ -315,16 +330,23 @@ jobs:
             PKGREL=1
           fi
 
-          echo "Publishing pgtidy-bin ${PKGVER}-${PKGREL} to AUR"
+          echo "Publishing ${PKG} ${PKGVER}-${PKGREL} to AUR"
 
-          SHA_AMD64=$(curl -fsSL "https://git.warky.dev/wdevs/pgtidy/releases/download/v${PKGVER}/pgtidy_${PKGVER}_linux_amd64.tar.gz" | sha256sum | cut -d' ' -f1)
+          DL="https://git.warky.dev/wdevs/pgtidy/releases/download/v${PKGVER}"
-          SHA_ARM64=$(curl -fsSL "https://git.warky.dev/wdevs/pgtidy/releases/download/v${PKGVER}/pgtidy_${PKGVER}_linux_arm64.tar.gz" | sha256sum | cut -d' ' -f1)
+          if [ "$PKG" = "pgtidy-bin" ]; then
+            SHA_AMD64=$(curl -fsSL "${DL}/pgtidy_${PKGVER}_linux_amd64.tar.gz" | sha256sum | cut -d' ' -f1)
+            SHA_ARM64=$(curl -fsSL "${DL}/pgtidy_${PKGVER}_linux_arm64.tar.gz" | sha256sum | cut -d' ' -f1)
+            SUMS=(-e "s/^sha256sums_x86_64=.*/sha256sums_x86_64=('${SHA_AMD64}')/" \
+                  -e "s/^sha256sums_aarch64=.*/sha256sums_aarch64=('${SHA_ARM64}')/")
+          else
+            SHA_SRC=$(curl -fsSL "${DL}/pgtidy-v${PKGVER}-source.tar.gz" | sha256sum | cut -d' ' -f1)
+            SUMS=(-e "s/^sha256sums=.*/sha256sums=('${SHA_SRC}')/")
+          fi
 
           sed -e "s/^pkgver=.*/pkgver=${PKGVER}/" \
               -e "s/^pkgrel=.*/pkgrel=${PKGREL}/" \
-              -e "s/^sha256sums_x86_64=.*/sha256sums_x86_64=('${SHA_AMD64}')/" \
+              "${SUMS[@]}" \
-              -e "s/^sha256sums_aarch64=.*/sha256sums_aarch64=('${SHA_ARM64}')/" \
+              "linux/arch/${PKG}/PKGBUILD" > aur-repo/PKGBUILD
-              linux/arch/PKGBUILD > aur-repo/PKGBUILD
 
           CID=$(docker run -d archlinux:latest sleep infinity)
           cleanup_docker() { docker rm -f "$CID" >/dev/null 2>&1 || true; }

Makefile

@@ -2,6 +2,12 @@ APP     := pgtidy
 CMD     := ./cmd/pgtidy
 DIST    := dist
 
+ARCH_PKGBUILDS := linux/arch/pgtidy-bin/PKGBUILD linux/arch/pgtidy-src/PKGBUILD
+RPM_SPEC       := linux/centos/pgtidy.spec
+VSCODE_PKG     := editors/vscode/package.json
+DATAGRIP_PROPS := editors/datagrip/gradle.properties
+PKG_FILES      := $(ARCH_PKGBUILDS) $(RPM_SPEC) $(VSCODE_PKG) $(DATAGRIP_PROPS)
+
 .PHONY: installer-windows build test lint vet fmt clean release release-version snapshot vscode-compile vscode-package
 
 ## build: compile binary for the current platform
@@ -44,12 +50,28 @@ release:
 	MAJOR=$$(echo $$CURRENT | sed 's/v\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'); \
 	MINOR=$$(echo $$CURRENT | sed 's/v\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'); \
 	PATCH=$$(echo $$CURRENT | sed 's/v\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'); \
-	NEXT="v$$MAJOR.$$MINOR.$$((PATCH + 1))"; \
+	echo "Current: $$CURRENT"; \
-	PKGVER="$$MAJOR.$$MINOR.$$((PATCH + 1))"; \
+	$(MAKE) --no-print-directory release-version VERSION="$$MAJOR.$$MINOR.$$((PATCH + 1))"
-	echo "Current: $$CURRENT → Next: $$NEXT"; \
+
-	sed -i "s/^pkgver=.*/pkgver=$$PKGVER/" linux/arch/PKGBUILD; \
+## release-version: release VERSION=X.Y.Z — set and verify version in all package files, commit, tag, push
-	sed -i "s/^Version:.*/Version:        $$PKGVER/" linux/centos/pgtidy.spec; \
+release-version:
-	git add linux/arch/PKGBUILD linux/centos/pgtidy.spec; \
+	@set -e; PKGVER="$(VERSION)"; PKGVER="$${PKGVER#v}"; NEXT="v$$PKGVER"; \
+	if ! echo "$$PKGVER" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$$'; then \
+		echo "VERSION must be X.Y.Z (got '$(VERSION)')"; exit 1; fi; \
+	if git rev-parse -q --verify "refs/tags/$$NEXT" >/dev/null; then \
+		echo "Tag $$NEXT already exists"; exit 1; fi; \
+	echo "Releasing $$NEXT"; \
+	sed -i "s/^pkgver=.*/pkgver=$$PKGVER/" $(ARCH_PKGBUILDS); \
+	sed -i "s/^Version:.*/Version:        $$PKGVER/" $(RPM_SPEC); \
+	sed -i "s/^  \"version\": \".*\",$$/  \"version\": \"$$PKGVER\",/" $(VSCODE_PKG); \
+	sed -i "s/^pluginVersion=.*/pluginVersion=$$PKGVER/" $(DATAGRIP_PROPS); \
+	fail=0; \
+	for f in $(ARCH_PKGBUILDS); do grep -qx "pkgver=$$PKGVER" $$f || { echo "pkgver not set in $$f"; fail=1; }; done; \
+	grep -qx "Version:        $$PKGVER" $(RPM_SPEC) || { echo "Version not set in $(RPM_SPEC)"; fail=1; }; \
+	grep -qx "  \"version\": \"$$PKGVER\"," $(VSCODE_PKG) || { echo "version not set in $(VSCODE_PKG)"; fail=1; }; \
+	grep -qx "pluginVersion=$$PKGVER" $(DATAGRIP_PROPS) || { echo "pluginVersion not set in $(DATAGRIP_PROPS)"; fail=1; }; \
+	if [ $$fail -ne 0 ]; then git checkout -- $(PKG_FILES); echo "Aborted — package files restored"; exit 1; fi; \
+	git add $(PKG_FILES); \
 	git commit -m "chore(release): bump version to $$PKGVER"; \
 	git tag -a "$$NEXT" -m "Release $$NEXT"; \
 	git push origin HEAD "$$NEXT"; \

editors/datagrip/.intellijPlatform/localPlatformArtifacts/bundledPlugin-com.intellij.database-DB-243.21565.204.xml

@@ -4,13 +4,13 @@
     <conf name="default" visibility="public"/>
   </configurations>
   <publications>
-    <artifact name="aether-dependency-resolver" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
-    <artifact name="maven-resolver-connector-basic" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
-    <artifact name="database-openapi" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
     <artifact name="jdbc-console" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
+    <artifact name="maven-resolver-transport-file" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
+    <artifact name="maven-resolver-connector-basic" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
     <artifact name="maven-resolver-transport-http" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
     <artifact name="database-plugin" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
-    <artifact name="maven-resolver-transport-file" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
+    <artifact name="database-openapi" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
+    <artifact name="aether-dependency-resolver" ext="jar" conf="default" url="plugins/DatabaseTools/lib"/>
   </publications>
   <dependencies>
     <dependency org="bundledPlugin" name="intellij.grid.core.impl" rev="DB-243.21565.204"/>

editors/datagrip/.intellijPlatform/localPlatformArtifacts/bundledPlugin-com.intellij.modules.json-DB-243.21565.204.xml

@@ -4,8 +4,8 @@
     <conf name="default" visibility="public"/>
   </configurations>
   <publications>
-    <artifact name="json-split" ext="jar" conf="default" url="plugins/json/lib"/>
     <artifact name="json" ext="jar" conf="default" url="plugins/json/lib"/>
+    <artifact name="json-split" ext="jar" conf="default" url="plugins/json/lib"/>
   </publications>
   <dependencies/>
 </ivy-module>

editors/datagrip/.intellijPlatform/localPlatformArtifacts/bundledPlugin-intellij.grid.core.impl-DB-243.21565.204.xml

@@ -4,8 +4,8 @@
     <conf name="default" visibility="public"/>
   </configurations>
   <publications>
-    <artifact name="grid-core-impl" ext="jar" conf="default" url="plugins/grid-core-impl/lib"/>
     <artifact name="jdbc-console-types" ext="jar" conf="default" url="plugins/grid-core-impl/lib"/>
+    <artifact name="grid-core-impl" ext="jar" conf="default" url="plugins/grid-core-impl/lib"/>
   </publications>
   <dependencies/>
 </ivy-module>

editors/datagrip/gradle.properties

@@ -1,6 +1,6 @@
 pluginGroup=com.pgtidy
 pluginName=PgTidy
-pluginVersion=0.1.0
+pluginVersion=1.0.0
 pluginSinceBuild=243
 # DataGrip 2024.3
 platformVersion=2024.3

editors/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "pgtidy",
   "displayName": "PgTidy",
   "description": "PostgreSQL formatter and linter powered by pgtidy",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "publisher": "warky-devs",
   "author": {
     "name": "Hein Puth",

linux/arch/pgtidy-bin/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Hein (Warky Devs) <hein@warky.dev>
 pkgname=pgtidy-bin
-pkgver=0.0.9
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="PostgreSQL SQL formatter and linter"
 arch=('x86_64' 'aarch64')

linux/arch/pgtidy-src/PKGBUILD

@@ -0,0 +1,33 @@
+# Maintainer: Hein (Warky Devs) <hein@warky.dev>
+pkgname=pgtidy-src
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="PostgreSQL SQL formatter and linter"
+arch=('x86_64' 'aarch64')
+url="https://git.warky.dev/wdevs/pgtidy"
+license=('MIT')
+makedepends=('go')
+provides=('pgtidy')
+conflicts=('pgtidy')
+source=("$pkgname-$pkgver.tar.gz::$url/releases/download/v$pkgver/pgtidy-v$pkgver-source.tar.gz")
+sha256sums=('SKIP')
+
+build() {
+    cd "pgtidy-$pkgver"
+    export CGO_ENABLED=0
+    go build \
+        -trimpath \
+        -ldflags "-X main.version=v$pkgver" \
+        -o pgtidy ./cmd/pgtidy
+}
+
+check() {
+    cd "pgtidy-$pkgver"
+    go test ./...
+}
+
+package() {
+    cd "pgtidy-$pkgver"
+    install -Dm755 "pgtidy" "$pkgdir/usr/bin/pgtidy"
+    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

linux/centos/pgtidy.spec

@@ -1,5 +1,5 @@
 Name:           pgtidy
-Version:        0.0.9
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        PostgreSQL SQL formatter and linter