Skip to content

Commit 1c9c1f1

Browse files
committed
apply fix for wrappers build, deactivate ext in unit test
1 parent f9cadcc commit 1c9c1f1

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

ansible/tasks/test-image.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@
5757
LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
5858
when: stage2_nix
5959

60-
- name: Run Unit tests (with filename unit-test-*) on Postgres Database
61-
shell: /usr/bin/pg_prove -U postgres -h localhost -d postgres -v /tmp/unit-tests/unit-test-*.sql
62-
register: retval
63-
failed_when: retval.rc != 0
64-
when: debpkg_mode or stage2_nix
6560

6661
- name: Check psql_version and modify migrations if oriole-xx
6762
block:
@@ -95,7 +90,19 @@
9590
loop: "{{ files_to_remove.files }}"
9691
when: is_psql_oriole
9792
become: yes
98-
93+
94+
- name: Remove specified extensions from SQL file
95+
ansible.builtin.command:
96+
cmd: >
97+
sed -i "/'pg_graphql',/d" /tmp/unit-tests/unit-test-01.sql
98+
when: is_psql_oriole
99+
become: yes
100+
101+
- name: Run Unit tests (with filename unit-test-*) on Postgres Database
102+
shell: /usr/bin/pg_prove -U postgres -h localhost -d postgres -v /tmp/unit-tests/unit-test-*.sql
103+
register: retval
104+
failed_when: retval.rc != 0
105+
when: debpkg_mode or stage2_nix
99106

100107
- name: Run migrations tests
101108
shell: /usr/bin/pg_prove -U supabase_admin -h localhost -d postgres -v tests/test.sql

nix/ext/wrappers/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildPgrxExtension_0_12_6 rec {
3030
};
3131

3232
nativeBuildInputs = [ pkg-config cargo ];
33-
buildInputs = [ openssl postgresql ] ++ lib.optionals (stdenv.isDarwin) [
33+
buildInputs = [ openssl postgresql git ] ++ lib.optionals (stdenv.isDarwin) [
3434
darwin.apple_sdk.frameworks.CoreFoundation
3535
darwin.apple_sdk.frameworks.Security
3636
darwin.apple_sdk.frameworks.SystemConfiguration

0 commit comments

Comments
 (0)