Enable readline support in postgres build; some cleanup (#5)

Author: aaron-siegel

.github/workflows/build-and-test.yml

@@ -33,11 +33,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         with:
           python-version: '3.10'
       - uses: actions/setup-python@v4
-        if: matrix.os == 'ubuntu-latest'
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
           # for testing due to docker env issues
         with:
           python-version: '3.9'
@@ -46,7 +46,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install --upgrade cibuildwheel
       - name: Restore postgres build from cache
-        if: ${{ matrix.os != 'ubuntu-latest' }}
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}
         id: restore-postgres
         uses: actions/cache/restore@v3
         env:
@@ -58,14 +58,14 @@ jobs:
           key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}-${{
             hashFiles('Makefile', 'pgbuild/Makefile', '.github/workflows/build-and-test.yml') }}
       - name: Build postgres and pgvector
-        if: ${{ matrix.os != 'ubuntu-latest' && ! steps.restore-postgres.outputs.cache-hit }}
+        if: ${{ !startsWith(matrix.os, 'ubuntu') && !steps.restore-postgres.outputs.cache-hit }}
+        # Run `make` now so that we may cache the postgres build before running cibuildwheel
+        # (On Linux cibuildwheel runs in a docker container, so this won't work)
         env:
           MACOSX_DEPLOYMENT_TARGET: ${{ matrix.deployment-target }}
-        # this step is implied by Build wheels, but we do it here for caching before python tests run
-        # on ubuntu, cibuildwheel will run this step within a docker container, so it cannot use the cache this way
         run: make
       - name: Save postgres build
-        if: ${{ matrix.os != 'ubuntu-latest' && ! steps.restore-postgres.outputs.cache-hit }}
+        if: ${{ !startsWith(matrix.os, 'ubuntu') && !steps.restore-postgres.outputs.cache-hit }}
         id: cache-postgres
         uses: actions/cache/save@v3
         env:
@@ -82,18 +82,6 @@ jobs:
           CIBW_SKIP: pp* cp313-* *-musllinux*
           MACOSX_DEPLOYMENT_TARGET: ${{ matrix.deployment-target }}
         run: python -m cibuildwheel --output-dir wheelhouse
-      - name: Save postgres build
-        if: ${{ matrix.os == 'ubuntu-latest' && ! steps.restore-postgres.outputs.cache-hit }}
-        id: cache-postgres2
-        uses: actions/cache/save@v3
-        env:
-          cache-name: cache-postgres
-        with:
-          path: |
-           pgbuild
-           src/pixeltable_pgserver/pginstall
-          key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}-${{
-            hashFiles('Makefile', 'pgbuild/Makefile', '.github/workflows/build-and-test.yml') }}
       - uses: actions/upload-artifact@v3
         with:
           path: wheelhouse/*.whl

pgbuild/Makefile

@@ -22,7 +22,7 @@ $(POSTGRES_SRC)/configure: $(POSTGRES_SRC).tar.gz
 ## configure
 $(POSTGRES_BLD)/config.status: $(POSTGRES_SRC)/configure
 	mkdir -p $(POSTGRES_BLD)
-	cd $(POSTGRES_BLD) && ../$(POSTGRES_SRC)/configure --prefix=$(INSTALL_PREFIX) --without-readline --without-icu
+	cd $(POSTGRES_BLD) && ../$(POSTGRES_SRC)/configure --prefix=$(INSTALL_PREFIX) --without-icu
 
 ## build
 # https://stackoverflow.com/questions/68379786/

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pixeltable-pgserver"
-version = "0.2.2"
+version = "0.2.3"
 description = "Embedded Postgres Server for Pixeltable"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -42,3 +42,6 @@ testpaths = ["tests"]
 before-all = "make"
 test-extras = "test"
 test-command = "bash -x {project}/cibuildwheel_test.bash {project}"
+
+[tool.cibuildwheel.linux]
+before-all = "yum install -y readline-devel; make"