Skip to content

Commit e0d6a1c

Browse files
danolivomason-sharp
authored andcommitted
Cumulative changes after review
1 parent 0ea3a12 commit e0d6a1c

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

.github/workflows/zodan_sync.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,7 @@ jobs:
4242

4343
- name: Build docker container
4444
run: |
45-
cd ${GITHUB_WORKSPACE}/
46-
ls -la
47-
ls -la sql
48-
ls -la tests/
49-
ls -la tests/tap
50-
ls -la tests/tap/t
51-
cat tests/tap/t/011_zodan_sync_third.pl
52-
docker build \
45+
docker build \
5346
--build-arg PGVER=${{ matrix.pgver }} \
5447
-t spock -f tests/docker/Dockerfile-step-1.el9 .
5548

tests/docker/Dockerfile-step-1.el9

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,8 @@ RUN . /home/pgedge/.bashrc && export PG_CONFIG=/home/pgedge/pgedge/pg$PGVER/bin/
4747
RUN echo "==========Built Spock=========="
4848

4949
#-----------------------------------------
50-
COPY \
51-
tests/docker/entrypoint.sh \
52-
tests/docker/run-tests.sh \
53-
tests/docker/run-spock-regress.sh \
54-
tests/docker/run-spock-tap.sh \
55-
/home/pgedge
56-
57-
RUN sudo chmod +x \
58-
/home/pgedge/entrypoint.sh \
59-
/home/pgedge/run-tests.sh \
60-
/home/pgedge/run-spock-regress.sh \
61-
/home/pgedge/run-spock-tap.sh
50+
COPY tests/docker/*.sh /home/pgedge/
51+
RUN sudo chmod +x /home/pgedge/*.sh
6252

6353
WORKDIR /home/pgedge/
6454
USER pgedge

tests/docker/run-spock-tap.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
export PG_CONFIG=/home/pgedge/pgedge/pg${PGVER}/bin/pg_config
88
export PATH=/home/pgedge/pgedge/pg${PGVER}/bin:$PATH
99
export LD_LIBRARY_PATH=/home/pgedge/pgedge/pg${PGVER}/lib/:$LD_LIBRARY_PATH
10-
export PROVE_TESTS=$proven_tests
1110

1211
# PGVER should be previously set in the environment
1312
if [ -z "${PGVER}" ]

0 commit comments

Comments
 (0)