From 581abc27087e0ca26fc66ab50ea7bee58d562a0f Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Thu, 15 Feb 2024 23:48:33 +0900 Subject: [PATCH 1/5] Adjust CI macos build and test --- .github/workflows/macos.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2386333f2b..83fa72f54b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -66,24 +66,20 @@ jobs: run: | cd build make -j - sudo make install + make install - name: Install pgTAP - if: false run: | git clone https://github.com/theory/pgtap.git pgTapExtension cd pgTapExtension make -j - sudo make install - sudo cpan TAP::Parser::SourceHandler::pgTAP - sudo find /usr/local -name pg_prove - sudo ln -s /usr/local/Cellar/perl/5.32.1_1/bin/pg_prove symlink it into /usr/local/bin + make install + cpan TAP::Parser::SourceHandler::pgTAP - name: Test - if: false run: | - export PATH=/usr/local/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH - pg_ctl -D /usr/local/var/postgres start + export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH + pg_ctl -D $(brew --prefix)/var/postgres start createuser -s postgres createdb ___pgr___test___ bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release From 63de65fdb7f7b3328ece6be9b216c2e78b8c68d0 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 16 Feb 2024 00:09:34 +0900 Subject: [PATCH 2/5] Start postgresql by brew services in macos CI --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 83fa72f54b..ca45256249 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -79,7 +79,7 @@ jobs: - name: Test run: | export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH - pg_ctl -D $(brew --prefix)/var/postgres start + brew services start postgresql createuser -s postgres createdb ___pgr___test___ bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release From 655c8b31d4daee1afc66d9d785511ce1801ae6f0 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 16 Feb 2024 00:40:12 +0900 Subject: [PATCH 3/5] Use postgresql@14 as macos postgresql data location --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ca45256249..f7a1641592 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -79,7 +79,7 @@ jobs: - name: Test run: | export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH - brew services start postgresql + pg_ctl -D $(brew --prefix)/var/postgresql@14 start createuser -s postgres createdb ___pgr___test___ bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release From d11e59d802e2d7089d2835680f28febef5ce6ac1 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 16 Feb 2024 01:18:34 +0900 Subject: [PATCH 4/5] Add pg_prove symbolic link into homebrew bin --- .github/workflows/macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f7a1641592..acff96fbaa 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -75,6 +75,7 @@ jobs: make -j make install cpan TAP::Parser::SourceHandler::pgTAP + ln -s $(find `brew --prefix` -name pg_prove) symlink it into $(brew --prefix)/bin - name: Test run: | From b1a9c55db57a4ac35633e4b43f2eda5274f2afc2 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Sun, 16 Jun 2024 18:40:01 +0900 Subject: [PATCH 5/5] Use only macos-latest (=macos-14) --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index acff96fbaa..95921e88fb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, macos-14] + os: [macos-latest] steps: - name: Checkout repository