From b4d6a7224cf5a5bf24fb7111f49b921f2b962920 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:00:57 -0800 Subject: [PATCH 01/23] fix tests --- .github/workflows/ci.yml | 1 + pgml-extension/src/orm/snapshot.rs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1859d8aa..b1b3fa00b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,6 +61,7 @@ jobs: if [[ ! -d ~/.pgrx ]]; then cargo pgrx init + echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf fi git checkout master diff --git a/pgml-extension/src/orm/snapshot.rs b/pgml-extension/src/orm/snapshot.rs index 9a0c22780..402dff976 100644 --- a/pgml-extension/src/orm/snapshot.rs +++ b/pgml-extension/src/orm/snapshot.rs @@ -749,7 +749,9 @@ impl Snapshot { self.relation_name_quoted() ) } - false => self.test_sampling.get_sql(&self.relation_name_quoted(), self.columns.clone()), + false => self + .test_sampling + .get_sql(&self.relation_name_quoted(), self.columns.clone()), } } From 1ae938c8ff42ee99c65335c64f38289c5592abf9 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:23:32 -0800 Subject: [PATCH 02/23] try fetching first --- .github/workflows/ci.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1b3fa00b..580927956 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,11 +48,9 @@ jobs: run: | git submodule update --init --recursive - name: Get current version - id: current-version - run: echo "CI_BRANCH=$(git name-rev --name-only HEAD)" >> $GITHUB_OUTPUT - - name: Run tests - env: - CI_BRANCH: ${{ steps.current-version.outputs.CI_BRANCH }} + id: current_version + run: echo "CI_BRANCH=$(git name-rev --name-only HEAD)" >> $GITHUB_OUTPUT + - name: Install Dependencies if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | curl https://sh.rustup.rs -sSf | sh -s -- -y @@ -63,14 +61,22 @@ jobs: cargo pgrx init echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf fi - + - name: Update extension + if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' + run: | + git fetch git checkout master echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "CREATE EXTENSION pgml;" git checkout $CI_BRANCH echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" + - name: Run tests + env: + CI_BRANCH: ${{ steps.current_version.outputs.CI_BRANCH }} + if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' + run: | cargo pgrx test -# cargo pgrx start -# psql -p 28815 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql -# cargo pgrx stop + cargo pgrx start + psql -p 28815 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql + cargo pgrx stop From 8e1c0b4c3dc4ac974e3bfd153e0013d8db7e4546 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:24:40 -0800 Subject: [PATCH 03/23] order --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 580927956..1aa5c77b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,10 +47,7 @@ jobs: if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | git submodule update --init --recursive - - name: Get current version - id: current_version - run: echo "CI_BRANCH=$(git name-rev --name-only HEAD)" >> $GITHUB_OUTPUT - - name: Install Dependencies + - name: Install pgrx if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | curl https://sh.rustup.rs -sSf | sh -s -- -y @@ -61,6 +58,9 @@ jobs: cargo pgrx init echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf fi + - name: Get current version + id: current_version + run: echo "CI_BRANCH=$(git name-rev --name-only HEAD)" >> $GITHUB_OUTPUT - name: Update extension if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | From 16add56cfe6cde0e73d8ce5c05049d3c2f66f50d Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:30:27 -0800 Subject: [PATCH 04/23] full diff --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1aa5c77b5..124dc1b0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Changed files in pgml-extension id: pgml_extension_changed run: | - echo "PGML_EXTENSION_CHANGED_FILES=$(git diff --name-only HEAD HEAD~1 . | wc -l)" >> $GITHUB_OUTPUT + echo "PGML_EXTENSION_CHANGED_FILES=$(git diff --name-only HEAD master . | wc -l)" >> $GITHUB_OUTPUT - name: Install dependencies if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | From 3015ddea904e852e3a0c516675886b149dd7d88e Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:32:57 -0800 Subject: [PATCH 05/23] fetch first --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 124dc1b0f..480cee186 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: - name: Changed files in pgml-extension id: pgml_extension_changed run: | + git fetch echo "PGML_EXTENSION_CHANGED_FILES=$(git diff --name-only HEAD master . | wc -l)" >> $GITHUB_OUTPUT - name: Install dependencies if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' @@ -64,7 +65,6 @@ jobs: - name: Update extension if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | - git fetch git checkout master echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "CREATE EXTENSION pgml;" From 0fc41af631d628b5047eb0d26b08c75eeaeede3e Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:41:42 -0800 Subject: [PATCH 06/23] v4 --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 480cee186..8eb300bb5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,13 +9,12 @@ jobs: run: working-directory: pgml-extension steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: - fetch-depth: 2 + fetch-depth: 0 - name: Changed files in pgml-extension id: pgml_extension_changed run: | - git fetch echo "PGML_EXTENSION_CHANGED_FILES=$(git diff --name-only HEAD master . | wc -l)" >> $GITHUB_OUTPUT - name: Install dependencies if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' From 9a3b7573408a0f2f158a26759f9e798d9f61f4e7 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:49:42 -0800 Subject: [PATCH 07/23] v4 --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8eb300bb5..0e3fc6dd4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,16 +58,13 @@ jobs: cargo pgrx init echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf fi - - name: Get current version - id: current_version - run: echo "CI_BRANCH=$(git name-rev --name-only HEAD)" >> $GITHUB_OUTPUT - name: Update extension if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | git checkout master echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "CREATE EXTENSION pgml;" - git checkout $CI_BRANCH + git checkout $GITHUB_SHA echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" - name: Run tests From be2f43f5eb729aa7d93de81af0bd47773ed36d0f Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:53:50 -0800 Subject: [PATCH 08/23] master --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e3fc6dd4..fd1832bd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,9 @@ jobs: working-directory: pgml-extension steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 + - name: Fetch master + run: | + git fetch origin master --depth 1 - name: Changed files in pgml-extension id: pgml_extension_changed run: | From 008f5a5f2d99a1fc5e0b8866509d1fd09c28ff02 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:56:20 -0800 Subject: [PATCH 09/23] ambigous --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd1832bd3..b0d0e5a47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Changed files in pgml-extension id: pgml_extension_changed run: | - echo "PGML_EXTENSION_CHANGED_FILES=$(git diff --name-only HEAD master . | wc -l)" >> $GITHUB_OUTPUT + echo "PGML_EXTENSION_CHANGED_FILES=$(git diff --name-only HEAD origin/master . | wc -l)" >> $GITHUB_OUTPUT - name: Install dependencies if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | From ea643b9e9ed0230d4c67394d27ff0770e1e5dd8e Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 18:59:05 -0800 Subject: [PATCH 10/23] more origin --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0d0e5a47..808577890 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: - name: Update extension if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | - git checkout master + git checkout origin/master echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "CREATE EXTENSION pgml;" git checkout $GITHUB_SHA @@ -75,5 +75,5 @@ jobs: run: | cargo pgrx test cargo pgrx start - psql -p 28815 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql + psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql cargo pgrx stop From 667ac99c06a70d125b440a3f56a9c19d5e6d90bd Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 19:08:01 -0800 Subject: [PATCH 11/23] pgrx --- .github/workflows/ci.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 808577890..863f6e357 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,8 @@ jobs: working-directory: pgml-extension steps: - uses: actions/checkout@v4 + with: + submodules: 'recursive' - name: Fetch master run: | git fetch origin master --depth 1 @@ -17,7 +19,7 @@ jobs: id: pgml_extension_changed run: | echo "PGML_EXTENSION_CHANGED_FILES=$(git diff --name-only HEAD origin/master . | wc -l)" >> $GITHUB_OUTPUT - - name: Install dependencies + - name: System dependencies if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | sudo apt-get update && \ @@ -35,19 +37,6 @@ jobs: python3 \ lld sudo pip3 install -r requirements.linux.txt - - name: Cache dependencies - uses: buildjet/cache@v3 - if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' - with: - path: | - ~/.cargo - pgml-extension/target - ~/.pgrx - key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }} - - name: Submodules - if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' - run: | - git submodule update --init --recursive - name: Install pgrx if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | @@ -59,6 +48,15 @@ jobs: cargo pgrx init echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf fi + - name: Cache dependencies + uses: buildjet/cache@v3 + if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' + with: + path: | + ~/.cargo + pgml-extension/target + ~/.pgrx + key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }}-bust1 - name: Update extension if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | From 99a431bb1196b17283f647ccd64f8d798dc47dac Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 19:17:05 -0800 Subject: [PATCH 12/23] split --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 863f6e357..22cc84961 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,12 +66,17 @@ jobs: git checkout $GITHUB_SHA echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" - - name: Run tests + - name: Unit tests env: CI_BRANCH: ${{ steps.current_version.outputs.CI_BRANCH }} if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | cargo pgrx test + - name: Integration tests + env: + CI_BRANCH: ${{ steps.current_version.outputs.CI_BRANCH }} + if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' + run: | cargo pgrx start psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql cargo pgrx stop From 5986bc682ff33cb5f37daab2e3bc3b1ae3ef91c4 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 19:41:42 -0800 Subject: [PATCH 13/23] drop extension --- .github/workflows/ci.yml | 9 +++------ pgml-extension/tests/test.sql | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22cc84961..bf9bec44f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,25 +56,22 @@ jobs: ~/.cargo pgml-extension/target ~/.pgrx - key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }}-bust1 - - name: Update extension + key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }} + - name: Update extension test if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | git checkout origin/master echo "\q" | cargo pgrx run + psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE;" psql -p 28816 -h localhost -d pgml -P pager -c "CREATE EXTENSION pgml;" git checkout $GITHUB_SHA echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" - name: Unit tests - env: - CI_BRANCH: ${{ steps.current_version.outputs.CI_BRANCH }} if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | cargo pgrx test - name: Integration tests - env: - CI_BRANCH: ${{ steps.current_version.outputs.CI_BRANCH }} if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | cargo pgrx start diff --git a/pgml-extension/tests/test.sql b/pgml-extension/tests/test.sql index 1b9e3771b..a6c75dee9 100644 --- a/pgml-extension/tests/test.sql +++ b/pgml-extension/tests/test.sql @@ -4,7 +4,7 @@ --- Usage: --- --- $ cargo pgrx run --release ---- $ psql -h localhost -p 28815 -d pgml -f tests/test.sql -P pager +--- $ psql -h localhost -p 28816 -d pgml -f tests/test.sql -P pager --- \set ON_ERROR_STOP true \timing on From 467f459a261638ca44392b5a1d783f386b9e6d14 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 20:02:42 -0800 Subject: [PATCH 14/23] more sql --- pgml-extension/sql/setup_examples.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgml-extension/sql/setup_examples.sql b/pgml-extension/sql/setup_examples.sql index 4f14924ea..2d55b54d8 100644 --- a/pgml-extension/sql/setup_examples.sql +++ b/pgml-extension/sql/setup_examples.sql @@ -4,7 +4,7 @@ --- Usage: --- --- $ cargo pgrx run --release ---- $ psql -P pager-off -h localhost -p 28813 -d pgml -f sql/setup_examples.sql +--- $ psql -P pager-off -h localhost -p 28816 -d pgml -f sql/setup_examples.sql --- -- \set ON_ERROR_STOP true \timing on From 8333e387adc7d5d57fc777a271237e9eff25c5d3 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 20:06:56 -0800 Subject: [PATCH 15/23] add schema --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf9bec44f..fa4044f3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,6 +74,7 @@ jobs: - name: Integration tests if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | + cargo pgrx schema cargo pgrx start psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql cargo pgrx stop From 9aacf3bfd376092b3fff2f675c090da150b41ead Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 20:08:08 -0800 Subject: [PATCH 16/23] add schema --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa4044f3a..2162ef88b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,6 +63,7 @@ jobs: git checkout origin/master echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE;" + psql -p 28816 -h localhost -d pgml -P pager -c "DROP SCHEMA IF EXISTS pgml CASCADE;" psql -p 28816 -h localhost -d pgml -P pager -c "CREATE EXTENSION pgml;" git checkout $GITHUB_SHA echo "\q" | cargo pgrx run From c225c76c9184092ac07a8e78604d244480a5007a Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 20:25:36 -0800 Subject: [PATCH 17/23] add schema --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2162ef88b..d91f61a6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,15 @@ jobs: python3 \ lld sudo pip3 install -r requirements.linux.txt + - name: Cache dependencies + uses: buildjet/cache@v3 + if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' + with: + path: | + ~/.cargo + pgml-extension/target + ~/.pgrx + key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }}-bust2 - name: Install pgrx if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | @@ -48,15 +57,6 @@ jobs: cargo pgrx init echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf fi - - name: Cache dependencies - uses: buildjet/cache@v3 - if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' - with: - path: | - ~/.cargo - pgml-extension/target - ~/.pgrx - key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }} - name: Update extension test if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | From 4e8da56c086e0afebd08a50e63c7983dd0756ecd Mon Sep 17 00:00:00 2001 From: Montana Low Date: Thu, 29 Feb 2024 20:51:29 -0800 Subject: [PATCH 18/23] cache buster --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d91f61a6c..02833adb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,6 @@ jobs: - name: Integration tests if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | - cargo pgrx schema cargo pgrx start psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql cargo pgrx stop From 08b6b474d27074d9638d7d1f6c18a5edfeee39e5 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Fri, 1 Mar 2024 11:14:08 -0800 Subject: [PATCH 19/23] start/stop --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02833adb4..c3a029a3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,13 +61,13 @@ jobs: if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | git checkout origin/master - echo "\q" | cargo pgrx run - psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE;" - psql -p 28816 -h localhost -d pgml -P pager -c "DROP SCHEMA IF EXISTS pgml CASCADE;" - psql -p 28816 -h localhost -d pgml -P pager -c "CREATE EXTENSION pgml;" + cargo pgrx start + psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE; DROP SCHEMA IF EXISTS pgml CASCADE; CREATE EXTENSION pgml;" + cargo pgrx stop git checkout $GITHUB_SHA - echo "\q" | cargo pgrx run + cargo pgrx start psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" + cargo pgrx stop - name: Unit tests if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | From e43af5c98e8f4ab0175c5bc0fd8abf1e9c2355b6 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Fri, 1 Mar 2024 11:34:02 -0800 Subject: [PATCH 20/23] logs --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3a029a3f..9cf471ebf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,11 +61,11 @@ jobs: if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | git checkout origin/master - cargo pgrx start + cargo pgrx start | cat /home/runner/.pgrx/16.log psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE; DROP SCHEMA IF EXISTS pgml CASCADE; CREATE EXTENSION pgml;" cargo pgrx stop git checkout $GITHUB_SHA - cargo pgrx start + cargo pgrx start | cat /home/runner/.pgrx/16.log psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" cargo pgrx stop - name: Unit tests From 69173ec93742f3102de3ed1314512c3b1dca9a6b Mon Sep 17 00:00:00 2001 From: Montana Low Date: Fri, 1 Mar 2024 11:54:09 -0800 Subject: [PATCH 21/23] or --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9cf471ebf..a746c9fab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,11 +61,11 @@ jobs: if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | git checkout origin/master - cargo pgrx start | cat /home/runner/.pgrx/16.log + cargo pgrx start || cat ~/.pgrx/16.log psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE; DROP SCHEMA IF EXISTS pgml CASCADE; CREATE EXTENSION pgml;" cargo pgrx stop git checkout $GITHUB_SHA - cargo pgrx start | cat /home/runner/.pgrx/16.log + cargo pgrx start || cat ~/.pgrx/16.log psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" cargo pgrx stop - name: Unit tests From 61c3a5a354341b80b3c033a15fd8caea329b842c Mon Sep 17 00:00:00 2001 From: Montana Low Date: Fri, 1 Mar 2024 12:24:39 -0800 Subject: [PATCH 22/23] run starts/stops the server --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a746c9fab..91d83a586 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,13 +61,11 @@ jobs: if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | git checkout origin/master - cargo pgrx start || cat ~/.pgrx/16.log + echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE; DROP SCHEMA IF EXISTS pgml CASCADE; CREATE EXTENSION pgml;" - cargo pgrx stop git checkout $GITHUB_SHA - cargo pgrx start || cat ~/.pgrx/16.log + echo "\q" | cargo pgrx run psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;" - cargo pgrx stop - name: Unit tests if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | @@ -75,6 +73,4 @@ jobs: - name: Integration tests if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | - cargo pgrx start psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql - cargo pgrx stop From 35486989c46dc5ee7152fb88fbf428450287f871 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Fri, 1 Mar 2024 12:50:14 -0800 Subject: [PATCH 23/23] cargo pgrx test leaves a test only version of the extension --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91d83a586..0843fc0e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,4 +73,5 @@ jobs: - name: Integration tests if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0' run: | + echo "\q" | cargo pgrx run psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy