From 360d9beaafd8b04fc17ac03f1fee1296796559e8 Mon Sep 17 00:00:00 2001 From: "Victor M. Varela" Date: Sat, 14 Mar 2026 22:40:50 +0100 Subject: [PATCH 1/2] fix: update nfpm download URL and Chocolatey license format - nfpm v2.45.1 changed tarball naming from linux_amd64 to Linux_x86_64; update download URL in both DEB and RPM CI jobs - Chocolatey CLI v2.6.0 rejects elements in nuspec; replace with pointing to the LICENSE file Closes #61 --- .github/workflows/release.yml | 37 ++++++++++++++++------------ packaging/chocolatey/sql-pipe.nuspec | 2 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4888a08..400cf95 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -340,27 +340,32 @@ jobs: run: | NFPM_VERSION=2.45.1 curl -sfL -o /tmp/nfpm.tar.gz \ - "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_linux_amd64.tar.gz" + "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_Linux_x86_64.tar.gz" tar -xzf /tmp/nfpm.tar.gz -C /usr/local/bin nfpm - name: Stage files for packaging run: | - mkdir -p pkg-work - cp artifacts/${{ matrix.asset }} pkg-work/sql-pipe - chmod +x pkg-work/sql-pipe - cp artifacts/sql-pipe.1.gz pkg-work/sql-pipe.1.gz - cp LICENSE pkg-work/LICENSE + VERSION="${GITHUB_REF_NAME#v}" + ARCH="${{ matrix.goarch }}" - - name: Build .deb - working-directory: pkg-work - env: - VERSION: ${{ github.ref_name }} - GOARCH: ${{ matrix.goarch }} + # Map Go arch names to Zig binary suffixes + case "$ARCH" in + amd64) ZIG_ARCH="x86_64" ;; + arm64) ZIG_ARCH="aarch64" ;; + arm7) ZIG_ARCH="arm" ;; + 386) ZIG_ARCH="x86" ;; + esac + + mkdir -p staging + cp "artifacts/sql-pipe-${ZIG_ARCH}-linux" staging/sql-pipe + chmod +x staging/sql-pipe + + - name: Build .deb package run: | - VERSION="${VERSION#v}" - mkdir -p dist - VERSION="$VERSION" GOARCH="$GOARCH" \ - nfpm package -p deb \ + VERSION="${GITHUB_REF_NAME#v}" + ARCH="${{ matrix.goarch }}" + + nfpm package -p deb \ -f "$GITHUB_WORKSPACE/packaging/nfpm.yaml" \ -t dist/ @@ -405,7 +410,7 @@ jobs: run: | NFPM_VERSION=2.45.1 curl -sfL -o /tmp/nfpm.tar.gz \ - "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_linux_amd64.tar.gz" + "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_Linux_x86_64.tar.gz" tar -xzf /tmp/nfpm.tar.gz -C /usr/local/bin nfpm - name: Stage files for packaging diff --git a/packaging/chocolatey/sql-pipe.nuspec b/packaging/chocolatey/sql-pipe.nuspec index 25c2725..3e8c240 100644 --- a/packaging/chocolatey/sql-pipe.nuspec +++ b/packaging/chocolatey/sql-pipe.nuspec @@ -23,7 +23,7 @@ Columns are auto-detected as INTEGER, REAL, or TEXT. Use `--no-type-inference` t ]]> https://github.com/vmvarela/sql-pipe csv sql sqlite cli pipe terminal data - MIT + https://github.com/vmvarela/sql-pipe/blob/master/LICENSE false https://github.com/vmvarela/sql-pipe https://github.com/vmvarela/sql-pipe/issues From 92faea99276a06a178a7bf66e390070c55533fcc Mon Sep 17 00:00:00 2001 From: "Victor M. Varela" Date: Sat, 14 Mar 2026 22:43:35 +0100 Subject: [PATCH 2/2] fix: revert DEB staging rewrite to keep pkg-work pattern consistent The previous commit rewrote the DEB staging step to use a 'staging/' directory and removed working-directory from the build step, but left the upload step referencing 'pkg-work'. This would cause the upload to fail. It also dropped the man page and LICENSE from staging, which nfpm requires. Revert the DEB staging/build/upload steps to the original pkg-work pattern (matching the RPM job), keeping only the nfpm URL fix. --- .github/workflows/release.yml | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 400cf95..c283c39 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -345,27 +345,22 @@ jobs: - name: Stage files for packaging run: | - VERSION="${GITHUB_REF_NAME#v}" - ARCH="${{ matrix.goarch }}" - - # Map Go arch names to Zig binary suffixes - case "$ARCH" in - amd64) ZIG_ARCH="x86_64" ;; - arm64) ZIG_ARCH="aarch64" ;; - arm7) ZIG_ARCH="arm" ;; - 386) ZIG_ARCH="x86" ;; - esac - - mkdir -p staging - cp "artifacts/sql-pipe-${ZIG_ARCH}-linux" staging/sql-pipe - chmod +x staging/sql-pipe + mkdir -p pkg-work + cp artifacts/${{ matrix.asset }} pkg-work/sql-pipe + chmod +x pkg-work/sql-pipe + cp artifacts/sql-pipe.1.gz pkg-work/sql-pipe.1.gz + cp LICENSE pkg-work/LICENSE - - name: Build .deb package + - name: Build .deb + working-directory: pkg-work + env: + VERSION: ${{ github.ref_name }} + GOARCH: ${{ matrix.goarch }} run: | - VERSION="${GITHUB_REF_NAME#v}" - ARCH="${{ matrix.goarch }}" - - nfpm package -p deb \ + VERSION="${VERSION#v}" + mkdir -p dist + VERSION="$VERSION" GOARCH="$GOARCH" \ + nfpm package -p deb \ -f "$GITHUB_WORKSPACE/packaging/nfpm.yaml" \ -t dist/