Skip to content

Commit 521129b

Browse files
committed
fix(CI): attempt to fix running the docker image on the corpus
1 parent 3ff443d commit 521129b

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.github/workflows/build-and-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
- name: Run learn-ocaml build on demo-repository
2727
run: "docker run --rm -v $(pwd)/demo-repository:/repository learn-ocaml -- build"
2828
- name: Clone learn-ocaml-corpus inside tests/corpuses
29-
run: "mkdir tests/corpuses && cd tests/corpuses && git clone --depth=1 https://github.com/ocaml-sf/learn-ocaml-corpus.git && cd ../.."
29+
run: "git clone --depth=1 https://github.com/ocaml-sf/learn-ocaml-corpus.git tests/corpuses/learn-ocaml-corpus"
3030
- name: Run tests
31-
run: "cd tests && bash -c ./runtests.sh"
31+
run: "tests/runtests.sh"
3232

3333
client_using_other_server:
3434
name: Build learn-ocaml-client and run quick tests

tests/runtests.sh

+7-6
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,14 @@ run_server () {
6969
REPO="$srcdir"/"$dir"/repo
7070
chmod -R a+w "$REPO"
7171

72-
mkdir "$SYNC" 2>/dev/null
72+
mkdir -p "$SYNC" 2>/dev/null
7373
chmod o+w "$SYNC"
7474

7575
# Run the server in background
76-
SERVERID=$(set -x; docker run --entrypoint '' -d -p 8080:8080 \
76+
SERVERID=$(set -x; docker run -d -p 8080:8080 \
7777
-v "$srcdir/$dir":/home/learn-ocaml/actual \
7878
-v "$SYNC":/sync -v "$REPO":/repository \
79-
learn-ocaml /bin/sh -c \
80-
"learn-ocaml --sync-dir=/sync --repo=/repository build serve")
79+
learn-ocaml)
8180

8281
# Wait for the server to be initialized
8382
if ! wait_for_it "http://localhost:8080/version" "$build_timeout" sleep 1s ||
@@ -233,9 +232,11 @@ while IFS= read -r corpus;
233232
do
234233
echo "---> Testing corpus $corpus:"
235234

236-
if ! ( set -x; docker run --entrypoint '' \
235+
chmod -R a+w "$corpus"
236+
237+
if ! ( set -x; docker run --rm \
237238
-v "$(realpath "$corpus"):/repository" \
238-
learn-ocaml /bin/sh -c "learn-ocaml --repo=/repository build" ); then
239+
learn-ocaml build ); then
239240
red "Failed to build $corpus"
240241
exit 1
241242
fi

0 commit comments

Comments
 (0)