Skip to content

Commit cab383d

Browse files
committed
Fix path
1 parent 760b6af commit cab383d

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

.github/workflows/test.yml

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

2727
steps:
28-
# Get Postgres sources
28+
# Get Postgres sources
2929
- name: Checkout PostgreSQL
3030
uses: actions/checkout@v3
3131
with:
@@ -36,12 +36,15 @@ jobs:
3636
# Get extension
3737
- name: Checkout shared_ispell
3838
uses: actions/checkout@v3
39+
with:
40+
path: shared_ispell
3941

4042
# Install Postgres
4143
- name: Install PostgreSQL
4244
run: |
43-
make -C postgres install-world-bin prefix=$HOME/pgsql
45+
make install-postgres top_builddir=$GITHUB_WORKSPACE/postgres prefix=$HOME/pgsql
4446
echo "$HOME/pgsql/bin" >> $GITHUB_PATH
47+
working-directory: shared_ispell
4548

4649
# Set PG_CONFIG
4750
- name: Set PG_CONFIG
@@ -58,6 +61,7 @@ jobs:
5861
- name: Build (automake)
5962
if: matrix.build == 'automake'
6063
run: |
64+
cd shared_ispell
6165
make USE_PGXS=1
6266
make USE_PGXS=1 install
6367
@@ -71,12 +75,17 @@ jobs:
7175
meson install -C builddir
7276
7377
# Create extension + run tests
74-
- name: Run SQL tests
78+
- name: Check create extension
7579
run: |
80+
cd shared_ispell
7681
createdb test
7782
psql -d test -c "CREATE EXTENSION shared_ispell;"
7883
79-
for f in sql/*.sql; do
80-
echo "Running $f"
81-
psql -d test -f "$f"
82-
done
84+
- name: Run tests
85+
run: |
86+
cd shared_ispell
87+
if [ "${{ matrix.build }}" = "meson" ]; then
88+
meson test -C builddir --verbose
89+
else
90+
make USE_PGXS=1 installcheck
91+
fi

0 commit comments

Comments
 (0)