ci: update

pgq · Apr 6, 2024 · ac979cb · ac979cb
1 parent 3311b74
commit ac979cb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,22 +21,27 @@ jobs:
     strategy:
       matrix:
         test:
-          - {pgver: "12", os: "ubuntu-18.04"}
-          - {pgver: "13", os: "ubuntu-20.04"}
-          - {pgver: "14", os: "ubuntu-22.04"}
-          - {pgver: "14", os: "macos-latest"}
+          - {pgver: "12", os: "ubuntu-latest"}
+          #- {pgver: "14", os: "ubuntu-latest"}
+          #- {pgver: "16", os: "ubuntu-latest"}
+          #- {pgver: "16", os: "macos-latest"}
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: "InstallDB / Linux"
         if: ${{runner.os == 'Linux'}}
         run: |
           echo "::group::apt-get-update"
+          sudo -nH apt-get -q update
+          sudo -nH apt-get -q install curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+          | gpg --dearmor \
+          | sudo -nH tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg
           echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main ${{matrix.test.pgver}}" \
-          | sudo tee /etc/apt/sources.list.d/pgdg.list
+          | sudo -nH tee /etc/apt/sources.list.d/pgdg.list
           sudo -nH apt-get -q update
           echo "::endgroup::"
 
@@ -108,11 +113,11 @@ jobs:
     strategy:
       matrix:
         test:
-          - {os: "windows-2019", arch: i686, mingw: mingw32}
-          - {os: "windows-2019", arch: x86_64, mingw: mingw64}
+          #- {os: "windows-latest", arch: i686, mingw: mingw32}
+          - {os: "windows-latest", arch: x86_64, mingw: mingw64}
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -130,19 +135,30 @@ jobs:
           pacman -Ss autoconf
           pacman -Ss automake
           pacman -Ss libtool
+          pacman -Ss postgresql
           # install
           pacman -S --noconfirm --needed \
+            mingw-w64-${{matrix.test.arch}}-libxml2 \
+            mingw-w64-${{matrix.test.arch}}-libxslt \
+            mingw-w64-${{matrix.test.arch}}-gettext \
             mingw-w64-${{matrix.test.arch}}-postgresql \
             mingw-w64-${{matrix.test.arch}}-python-docutils \
             mingw-w64-${{matrix.test.arch}}-libevent \
-            autoconf automake libtool
+            mingw-w64-${{matrix.test.arch}}-pkgconf \
+            autoconf automake libtool pkgconf
+          INCDIR=$(pg_config --includedir)
+          PG_CPPFLAGS="-I${INCDIR}"
+          #PG_CPPFLAGS="${PG_CPPFLAGS} -fstack-check=no -fno-stack-protector"
+          echo "PG_CPPFLAGS=${PG_CPPFLAGS}" >> $GITHUB_ENV
+          echo "PG_CPPFLAGS=${PG_CPPFLAGS}"
           echo "PATH=$PATH"
 
       - name: "Build"
         shell: bash
         run: |
+          workspace=$(echo "${GITHUB_WORKSPACE}" | sed -f etc/pathsep.sed)
           ./autogen.sh
-          ./configure --prefix=${GITHUB_WORKSPACE}/testinstall
+          ./configure --prefix="${workspace}/testinstall"
           make
           make install
           ./pgqd -V

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
 
       - name: Checkout code
         id: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 

diff --git a/etc/pathsep.sed b/etc/pathsep.sed
@@ -0,0 +1 @@
+s,\\,/,g