Merge branch 'dimitri:master' into master

.github/workflows/docker-publish.yml

@@ -36,13 +36,15 @@ jobs:
         uses: actions/checkout@v2
         
 
-      # Install the cosign tool except on PR
+      # Install the cosign tool (not used on PR, still installed)
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@main
-        uses: sigstore/cosign-installer@v1.4.1
         with:
-          cosign-release: 'v1.4.1'
+          cosign-release: 'v2.2.3'
+
+      - name: Check cosign version
+        run: cosign version
 
 
       # Workaround: https://github.com/docker/build-push-action/issues/461
@@ -88,8 +90,11 @@ jobs:
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
         if: ${{ github.event_name != 'pull_request' }}
-        env:
-          COSIGN_EXPERIMENTAL: "true"
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
-        run: cosign sign ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}
+        run: cosign sign --yes ${TAGS}
+        env:
+          TAGS: ${{ steps.meta.outputs.tags }}
+          # should use @${{ steps.build-and-push.outputs.digest }}
+          # but that leads to "entity not found in registry"
+          COSIGN_EXPERIMENTAL: "true"

Dockerfile

@@ -34,6 +34,7 @@ FROM debian:bookworm-slim
 
   RUN apt-get update \
       && apt-get install -y --no-install-recommends \
+        ca-certificates \
         curl \
         freetds-dev \
         gawk \
@@ -42,6 +43,7 @@ FROM debian:bookworm-slim
         make \
         sbcl \
         unzip \
+      && update-ca-certificates \
       && rm -rf /var/lib/apt/lists/*
 
   COPY --from=builder /opt/src/pgloader/build/bin/pgloader /usr/local/bin

debian/changelog

@@ -1,3 +1,10 @@
+pgloader (3.6.10-2) unstable; urgency=medium
+
+  * Limit architectures to those that have sbcl available and working thread
+    support (notably, this excludes armel and armhf).
+
+ -- Christoph Berg <myon@debian.org>  Fri, 22 Mar 2024 14:59:27 +0100
+
 pgloader (3.6.10-1) unstable; urgency=medium
 
   * New upstream version.

debian/control

@@ -62,7 +62,7 @@ Vcs-Git: https://github.com/dimitri/pgloader.git
 Vcs-Browser: https://github.com/dimitri/pgloader
 
 Package: pgloader
-Architecture: any
+Architecture: amd64 arm64 i386 ppc64el powerpc ppc64
 Depends:
  freetds-dev,
  ${misc:Depends},

debian/rules

@@ -18,6 +18,8 @@ MAKEFILE_VERSION = $(shell awk '/^VERSION/ { print $$3 }' Makefile)
 DOC_VERSION = $(shell awk '/^release/ { print $$3 }' docs/conf.py | tr -d "'")
 SPECFILE_VERSION = $(shell awk '/^Version/ { print $$2 }' pgloader.spec)
 DEBIAN_VERSION = $(shell dpkg-parsechangelog -SVersion | cut -d- -f 1)
+PGLOADER_MAJOR_VERSION = $(shell awk '/^.defparameter .major-version/ { print $$3 }' src/params.lisp | grep -Eo '[0-9.]+')
+PGLOADER_MINOR_VERSION = $(shell awk '/^.defparameter .minor-version/ { print $$3 }' src/params.lisp | grep -Eo '[0-9.]+')
 
 # buildd provides a build environment where $HOME is not writable, but the
 # CL compilers here will need to fill-in a per-user cache
@@ -30,6 +32,7 @@ override_dh_auto_clean:
 	[ "$(MAKEFILE_VERSION)" = "$(DOC_VERSION)" ] # Makefile = docs/conf.py version
 	[ "$(MAKEFILE_VERSION)" = "$(SPECFILE_VERSION)" ] # Makefile = pgloader.spec version
 	[ "$(MAKEFILE_VERSION)" = "$(DEBIAN_VERSION)" ] # Makefile = debian/changelog version
+	[ "$(MAKEFILE_VERSION)" = "$(PGLOADER_MAJOR_VERSION).$(PGLOADER_MINOR_VERSION)" ] # Makefile = src/params.lisp version
 
 override_dh_auto_build-indep:
 	# do nothing

src/params.lisp

@@ -44,7 +44,7 @@
   "non-nil when this build is a release build.")
 
 (defparameter *major-version* "3.6")
-(defparameter *minor-version* "7")
+(defparameter *minor-version* "10")
 
 (defun git-hash ()
   "Return the current abbreviated git hash of the development tree."