chore: speed up CI

This now uses https://github.com/steve-chavez/xpg that already has the
cached pg versions.

Author: steve-chavez

.github/workflows/ci.yaml

@@ -14,11 +14,24 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v18
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Use Cachix Cache
+        uses: cachix/cachix-action@v10
+        with:
+          name: nxpg
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+
+      - name: Build
+        run: nix-shell --run "xpg -v ${{ matrix.pg-version }} build"
+
       - name: Run tests
-        run: nix-shell --run "nxpg-${{ matrix.pg-version }} nxpg-tmp nxpg-test"
+        run: nix-shell --run "xpg -v ${{ matrix.pg-version }} test"
+
       - if: ${{ failure() }}
         run: |
           cat regression.out
@@ -28,23 +41,34 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        pg-version: ['17']
+
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v18
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
+      - name: Use Cachix Cache
+        uses: cachix/cachix-action@v10
+        with:
+          name: nxpg
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+
       - name: Run coverage
-        run: nix-shell --run "nxpg-16 nxpg-tmp nxpg-coverage"
+        run: nix-shell --run "xpg -v ${{ matrix.pg-version }} coverage"
 
       - name: Send coverage to Coveralls
         uses: coverallsapp/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          files: ./coverage.info
-
+          files: ./build-${{ matrix.pg-version }}/coverage.info
 
   style:
 
@@ -54,9 +78,17 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v18
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
+      - name: Use Cachix Cache
+        uses: cachix/cachix-action@v10
+        with:
+          name: nxpg
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+
       - name: Run style check
-        run: nix-shell --run "nxpg-style-check"
+        run: nix-shell --run "plmustache-style-check"

Makefile

@@ -1,17 +1,7 @@
-## Our variables
-EXTENSION = plmustache
-EXTVERSION = 0.1
-SED ?= sed
-
-## PGXS variables
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-
-MODULE_big = $(EXTENSION)
-SRC = $(wildcard src/*.c)
-OBJS = $(patsubst src/%.c, src/%.o, $(SRC))
-SHLIB_LINK = -lmustach
+SRC_DIR = src
+BUILD_DIR ?= build
 
+# the `-Wno`s quiet C90 warnings
 PG_CFLAGS = -std=c11 -Wextra -Wall -Werror \
 	-Wno-declaration-after-statement \
 	-Wno-vla \
@@ -21,20 +11,49 @@ ifeq ($(COVERAGE), 1)
 PG_CFLAGS += --coverage
 endif
 
+EXTENSION = plmustache
+EXTVERSION = 0.1
+SED ?= sed
+
+DATA = $(wildcard sql/*--*.sql)
+
+EXTRA_CLEAN = sql/$(EXTENSION)--$(EXTVERSION).sql $(EXTENSION).control
+
 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))
 REGRESS_OPTS = --inputdir=test
 
-DATA = $(wildcard *--*.sql)
+MODULE_big = $(EXTENSION)
+SRC = $(wildcard $(SRC_DIR)/*.c)
+OBJS = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o, $(SRC))
+
+PG_CONFIG = pg_config
+SHLIB_LINK = -lmustach
+
+# Find <curl/curl.h> from system headers
+PG_CPPFLAGS := $(CPPFLAGS) -DEXTVERSION=\"$(EXTVERSION)\"
+
+build: $(BUILD_DIR)/$(EXTENSION).so $(BUILD_DIR)/$(EXTENSION)--$(EXTVERSION).sql $(BUILD_DIR)/$(EXTENSION).control
 
-EXTRA_CLEAN = $(EXTENSION)--$(EXTVERSION).sql $(EXTENSION).control
+$(BUILD_DIR)/.gitignore:
+	mkdir -p $(BUILD_DIR)
+	echo "*" > $(BUILD_DIR)/.gitignore
 
-all: $(EXTENSION)--$(EXTVERSION).sql $(EXTENSION).control
+$(BUILD_DIR)/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/.gitignore
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
-$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+$(BUILD_DIR)/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 	cp $< $@
 
-$(EXTENSION).control:
+$(BUILD_DIR)/$(EXTENSION).control:
 	$(SED) "s/@EXTVERSION@/$(EXTVERSION)/g" $(EXTENSION).control.in > $@
 
+$(BUILD_DIR)/$(EXTENSION).so: $(EXTENSION).so
+	mv $? $@
+
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
+
+.PHONY: test
+test:
+	make installcheck