Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cba0975a90 | ||
|
|
9809003dca | ||
|
|
a224961596 | ||
|
|
f0b0477931 |
@@ -123,6 +123,9 @@ jobs:
|
|||||||
|
|
||||||
- name: Build .deb packages
|
- name: Build .deb packages
|
||||||
run: |
|
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 }}"
|
VERSION="${{ github.event.inputs.tag || github.ref_name }}"
|
||||||
PKGVER="${VERSION#v}"
|
PKGVER="${VERSION#v}"
|
||||||
|
|
||||||
@@ -268,7 +271,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
pkg: [pgtidy-bin, pgtidy]
|
pkg: [pgtidy-bin, pgtidy-src]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,12 @@ APP := pgtidy
|
|||||||
CMD := ./cmd/pgtidy
|
CMD := ./cmd/pgtidy
|
||||||
DIST := dist
|
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
|
.PHONY: installer-windows build test lint vet fmt clean release release-version snapshot vscode-compile vscode-package
|
||||||
|
|
||||||
## build: compile binary for the current platform
|
## 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/'); \
|
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/'); \
|
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/'); \
|
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/pgtidy-bin/PKGBUILD linux/arch/pgtidy/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/pgtidy-bin/PKGBUILD linux/arch/pgtidy/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 commit -m "chore(release): bump version to $$PKGVER"; \
|
||||||
git tag -a "$$NEXT" -m "Release $$NEXT"; \
|
git tag -a "$$NEXT" -m "Release $$NEXT"; \
|
||||||
git push origin HEAD "$$NEXT"; \
|
git push origin HEAD "$$NEXT"; \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
pluginGroup=com.pgtidy
|
pluginGroup=com.pgtidy
|
||||||
pluginName=PgTidy
|
pluginName=PgTidy
|
||||||
pluginVersion=0.1.0
|
pluginVersion=1.0.0
|
||||||
pluginSinceBuild=243
|
pluginSinceBuild=243
|
||||||
# DataGrip 2024.3
|
# DataGrip 2024.3
|
||||||
platformVersion=2024.3
|
platformVersion=2024.3
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "pgtidy",
|
"name": "pgtidy",
|
||||||
"displayName": "PgTidy",
|
"displayName": "PgTidy",
|
||||||
"description": "PostgreSQL formatter and linter powered by pgtidy",
|
"description": "PostgreSQL formatter and linter powered by pgtidy",
|
||||||
"version": "0.1.0",
|
"version": "1.0.0",
|
||||||
"publisher": "warky-devs",
|
"publisher": "warky-devs",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Hein Puth",
|
"name": "Hein Puth",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Maintainer: Hein (Warky Devs) <hein@warky.dev>
|
# Maintainer: Hein (Warky Devs) <hein@warky.dev>
|
||||||
pkgname=pgtidy-bin
|
pkgname=pgtidy-bin
|
||||||
pkgver=0.0.10
|
pkgver=1.0.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="PostgreSQL SQL formatter and linter"
|
pkgdesc="PostgreSQL SQL formatter and linter"
|
||||||
arch=('x86_64' 'aarch64')
|
arch=('x86_64' 'aarch64')
|
||||||
|
|||||||
@@ -1,32 +1,33 @@
|
|||||||
# Maintainer: Hein (Warky Devs) <hein@warky.dev>
|
# Maintainer: Hein (Warky Devs) <hein@warky.dev>
|
||||||
pkgname=pgtidy
|
pkgname=pgtidy-src
|
||||||
pkgver=0.0.10
|
pkgver=1.0.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="PostgreSQL SQL formatter and linter"
|
pkgdesc="PostgreSQL SQL formatter and linter"
|
||||||
arch=('x86_64' 'aarch64')
|
arch=('x86_64' 'aarch64')
|
||||||
url="https://git.warky.dev/wdevs/pgtidy"
|
url="https://git.warky.dev/wdevs/pgtidy"
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
makedepends=('go')
|
makedepends=('go')
|
||||||
conflicts=('pgtidy-bin')
|
provides=('pgtidy')
|
||||||
|
conflicts=('pgtidy')
|
||||||
source=("$pkgname-$pkgver.tar.gz::$url/releases/download/v$pkgver/pgtidy-v$pkgver-source.tar.gz")
|
source=("$pkgname-$pkgver.tar.gz::$url/releases/download/v$pkgver/pgtidy-v$pkgver-source.tar.gz")
|
||||||
sha256sums=('SKIP')
|
sha256sums=('SKIP')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "pgtidy-$pkgver"
|
||||||
export CGO_ENABLED=0
|
export CGO_ENABLED=0
|
||||||
go build \
|
go build \
|
||||||
-trimpath \
|
-trimpath \
|
||||||
-ldflags "-X main.version=v$pkgver" \
|
-ldflags "-X main.version=v$pkgver" \
|
||||||
-o "$pkgname" ./cmd/pgtidy
|
-o pgtidy ./cmd/pgtidy
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "pgtidy-$pkgver"
|
||||||
go test ./...
|
go test ./...
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "pgtidy-$pkgver"
|
||||||
install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
|
install -Dm755 "pgtidy" "$pkgdir/usr/bin/pgtidy"
|
||||||
install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
Name: pgtidy
|
Name: pgtidy
|
||||||
Version: 0.0.10
|
Version: 1.0.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: PostgreSQL SQL formatter and linter
|
Summary: PostgreSQL SQL formatter and linter
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user