Fix lib path

Percona-Lab · Jan 23, 2024 · d13da51 · d13da51
1 parent ec099d8
commit d13da51
Showing 1 changed file with 16 additions and 24 deletions.
diff --git a/.github/workflows/postgresql-16-src-make-macos.yml b/.github/workflows/postgresql-16-src-make-macos.yml
@@ -10,40 +10,32 @@ jobs:
         run: |
           brew install make autoconf openssl@3 curl json-c gettext icu4c
 
-      - name: Debug
-        run : |
-          ls /usr/local/opt/
-          ls /usr/local/opt/json-c/
-          ls /usr/local/opt/json-c/include
-
-      # - name: Clone postgres repository
-      #   uses: actions/checkout@v4
-      #   with:
-      #     repository: 'postgres/postgres'
-      #     ref: 'a81e5516fa4bc53e332cb35eefe231147c0e1749'
-      #     path: 'src'
+      - name: Clone postgres repository
+        uses: actions/checkout@v4
+        with:
+          repository: 'postgres/postgres'
+          ref: 'a81e5516fa4bc53e332cb35eefe231147c0e1749'
+          path: 'src'
 
       - name: Clone postgres-tde-ext repository
         uses: actions/checkout@v2
         with:
           path: 'src/contrib/postgres-tde-ext'
 
-      # - name: Create pgsql dir
-      #   run: mkdir -p $HOME/pgsql
+      - name: Create pgsql dir
+        run: mkdir -p $HOME/pgsql
 
-      # - name: Build postgres
-      #   run: |
-      #     export LDFLAGS="-L/usr/local/opt/icu4c/lib -L/usr/local/opt/openssl/lib"
-      #     export CPPFLAGS="-I/usr/local/opt/icu4c/include -I/usr/local/opt/openssl/include"
-      #     export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig"
-      #     ./configure --with-openssl  --enable-tap-tests=no --prefix=$HOME/postgres
-      #     make -j
-      #     sudo make install
-      #   working-directory: src
+      - name: Build postgres
+        run: |
+          export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig"
+          ./configure --with-openssl  --enable-tap-tests=no --prefix=$HOME/postgres
+          make -j
+          sudo make install
+        working-directory: src
 
       - name: Build postgres-tde-ext
         run: |
-          export LDFLAGS="-L/usr/local/opt/json-c/lib -ljson-c"
+          export LDFLAGS="-L/usr/local/opt/json-c/lib"
           export CPPFLAGS="-I/usr/local/opt/json-c/include/json-c"
           ./configure
           make -j