diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5eda421 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 + +[*.{yml,yaml,md}] +indent_style = space +indent_size = 2 +quote_type = double diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0403edc..950f487 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -55,7 +55,7 @@ jobs: with: context: . platforms: linux/amd64,linux/arm64 - push: ${{ github.event_name != 'pull_request' }} + push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: | @@ -89,6 +89,9 @@ jobs: test: { from: 15, to: 17, name: "15 to 17 (multi-step)" } - platform: linux/amd64 test: { from: 14, to: 17, name: "14 to 17 (full upgrade)" } + # Supabase PostgreSQL upgrade test + - platform: linux/amd64 + test: { from: "supabase-14", to: 17, name: "Supabase 14.1.0.89 to 17", image: "public.ecr.aws/supabase/postgres:14.1.0.89" } # ARM64 test - just one to verify it works - platform: linux/arm64 test: { from: 14, to: 17, name: "14 to 17 (full upgrade)" } @@ -130,7 +133,7 @@ jobs: -v $PWD/test-data/${{ matrix.test.from }}:/var/lib/postgresql/data \ -e POSTGRES_PASSWORD=testpass \ -e POSTGRES_DB=testdb \ - postgres:${{ matrix.test.from }}-bookworm \ + ${{ matrix.test.image || format('postgres:{0}-bookworm', matrix.test.from) }} \ bash -c " set -e set -o pipefail diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77daaac..c3676b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,9 @@ on: jobs: test-builds: + # Disabled: This workflow tries to run Go tests that don't exist. + # Use build-and-test.yml instead which provides comprehensive Docker-based testing. + if: false runs-on: ubuntu-latest strategy: matrix: diff --git a/Dockerfile b/Dockerfile index cb5fbbd..b0a8fd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,7 +102,7 @@ ENV PG17BIN=/usr/lib/postgresql/17/bin ENV PG_VERSION=17 RUN curl -fsSL https://repo.pigsty.io/pig | bash && \ - dpkg -i /tmp/pig_0.6.1-1_arm64.deb && \ + dpkg -i /tmp/pig_0.6.1-1_${TARGETARCH}.deb && \ /usr/bin/pig repo add pigsty --update && \ for ver in 14 15 16 17; do \ /usr/bin/pig install -y --version $ver pgsodium pg_stat_statements pg_partman pg_jsonschema pg_hashids pg_tle pgjwt; \