Skip to content

Commit

Permalink
ci: updates
Browse files Browse the repository at this point in the history
- update actions/checkout
- win32: add missing libs
- macos: refresh pg version
  • Loading branch information
markokr committed Apr 7, 2024
1 parent 6d7c0e6 commit 826fa9b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
- {pgver: "14", os: "ubuntu-22.04", "repo": "pgdg"}
- {pgver: "15", os: "ubuntu-22.04", "repo": "pgdg"}
- {pgver: "16", os: "ubuntu-22.04", "repo": "pgdg"}
- {pgver: "14", os: "macos-latest"}
- {pgver: "16", os: "macos-latest"}
steps:
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "InstallDB / Linux"
if: ${{runner.os == 'Linux'}}
Expand Down Expand Up @@ -104,11 +104,10 @@ jobs:
strategy:
matrix:
test:
#- {os: "windows-latest", arch: "i686", mingw: "mingw32", bits: "32"}
- {os: "windows-latest", arch: "x86_64", mingw: "mingw64", bits: "64"}
steps:
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Setup MSYS"
shell: cmd
Expand All @@ -121,17 +120,13 @@ jobs:
run: |
# 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
# Workaround to find <libintl.h>
INCDIR=$(pg_config --includedir)
PG_CPPFLAGS="-I${INCDIR}"
PG_CPPFLAGS="${PG_CPPFLAGS} -fstack-check=no -fno-stack-protector" # enabled by default but broken
#case ${{matrix.test.arch}} in
#i686) PG_CFLAGS="-m32";;
#x86_64) PG_CFLAGS="-m64";;
#esac
#echo "PG_CFLAGS=${PG_CFLAGS}" >> $GITHUB_ENV
#echo "PG_CFLAGS=${PG_CFLAGS}"
echo "PG_CPPFLAGS=${PG_CPPFLAGS}" >> $GITHUB_ENV
echo "PG_CPPFLAGS=${PG_CPPFLAGS}"
echo "PATH=$PATH"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: "Checkout code"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Build tarball"
run: |
Expand Down

0 comments on commit 826fa9b

Please sign in to comment.