Skip to content

Commit 03cac54

Browse files
committed
Try to simplify
1 parent 6ff0099 commit 03cac54

File tree

1 file changed

+10
-32
lines changed

1 file changed

+10
-32
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,17 @@ jobs:
2525
PG_BRANCH: ${{ format('REL_{0}_STABLE', matrix.pg_version) }}
2626

2727
steps:
28-
# Get Postgres sources
29-
- name: Checkout PostgreSQL
30-
uses: actions/checkout@v3
31-
with:
32-
repository: postgres/postgres
33-
ref: ${{ format('REL_{0}_STABLE', matrix.pg_version) }}
34-
path: postgres
35-
36-
# Get extension
28+
# Checkout the extension
3729
- name: Checkout shared_ispell
3830
uses: actions/checkout@v3
3931
with:
4032
path: shared_ispell
4133

42-
# Install Postgres
43-
- name: Install PostgreSQL
44-
run: |
45-
make -C postgres install-world-bin prefix=$HOME/pgsql
46-
echo "$HOME/pgsql/bin" >> $GITHUB_PATH
47-
48-
# Set PG_CONFIG
34+
# Set PG_CONFIG from container
4935
- name: Set PG_CONFIG
50-
run: |
51-
echo "PG_CONFIG=$HOME/pgsql/bin/pg_config" >> $GITHUB_ENV
36+
run: echo "PG_CONFIG=/usr/bin/pg_config" >> $GITHUB_ENV
5237

53-
# Init + start server
38+
# Init + start PostgreSQL
5439
- name: Start PostgreSQL
5540
run: |
5641
initdb -D $PGDATA
@@ -60,26 +45,19 @@ jobs:
6045
- name: Build (automake)
6146
if: matrix.build == 'automake'
6247
run: |
63-
cd shared_ispell
64-
make USE_PGXS=1
65-
make USE_PGXS=1 install
48+
make -C shared_ispell USE_PGXS=1
49+
make -C shared_ispell USE_PGXS=1 install
6650
6751
# Build extension (meson)
6852
- name: Build (meson)
6953
if: matrix.build == 'meson'
7054
run: |
7155
PREFIX=$($PG_CONFIG --pgxs | sed 's|/lib/pgxs/src/makefiles/pgxs.mk||')
72-
meson setup builddir --prefix=$PREFIX
73-
meson compile -C builddir
74-
meson install -C builddir
75-
76-
# Create extension + run tests
77-
- name: Check create extension
78-
run: |
79-
cd shared_ispell
80-
createdb test
81-
psql -d test -c "CREATE EXTENSION shared_ispell;"
56+
meson setup shared_ispell/builddir --prefix=$PREFIX
57+
meson compile -C shared_ispell/builddir
58+
meson install -C shared_ispell/builddir
8259
60+
# Run tests
8361
- name: Run tests
8462
run: |
8563
make -C shared_ispell USE_PGXS=1 installcheck

0 commit comments

Comments
 (0)