From bfe0823c813e3a20aa2e95e9174051485d7005fb Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Thu, 22 Apr 2021 01:57:39 +0000 Subject: [PATCH] chore: Attempt to cache gocr --- .github/workflows/main.yaml | 8 ++++++++ test.sh | 24 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e816e1c..de197b7 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -92,6 +92,14 @@ jobs: LD_LIBRARY_PATH="$(pwd)/lib:$LD_LIBRARY_PATH" echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV make build-validate + - name: Cache gocr + uses: actions/cache@v2 + env: + cache-name: gocr + with: + # Cache the gocr webassembly module based on the submodule file + path: ./runtime/bin/gocr_wasm.so + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles(./runtime/tests/gocr') }} - name: Compile sample apps and run tests run: | ./test.sh diff --git a/test.sh b/test.sh index a3f9d79..d6a89a2 100755 --- a/test.sh +++ b/test.sh @@ -32,7 +32,9 @@ declare -a failed_tests=() # OCR Tests # FIXME: OCR tests seem to sporadically fail and then work on rerun. ocr_hyde() { - make gocr -C "$base_dir/runtime/tests" || exit 1 + if [[ ! -f "$base_dir/runtime/bin/gocr_wasm.so" ]]; then + make gocr -C "$base_dir/runtime/tests" || exit 1 + fi pushd "$base_dir/runtime/experiments/applications/ocr/hyde" || exit 1 ./run.sh || failed_tests+=("ocr_hyde") popd || exit 1 @@ -40,7 +42,9 @@ ocr_hyde() { } ocr_handwriting() { - make gocr -C "$base_dir/runtime/tests" || exit 1 + if [[ ! -f "$base_dir/runtime/bin/gocr_wasm.so" ]]; then + make gocr -C "$base_dir/runtime/tests" || exit 1 + fi pushd "$base_dir/runtime/experiments/applications/ocr/handwriting" || exit 1 ./run.sh || failed_tests+=("ocr_handwriting") popd || exit 1 @@ -48,7 +52,9 @@ ocr_handwriting() { } ocr_fivebyeight() { - make gocr -C "$base_dir/runtime/tests" || exit 1 + if [[ ! -f "$base_dir/runtime/bin/gocr_wasm.so" ]]; then + make gocr -C "$base_dir/runtime/tests" || exit 1 + fi pushd "$base_dir/runtime/experiments/applications/ocr/fivebyeight" || exit 1 ./run.sh || failed_tests+=("ocr_fivebyeight") popd || exit 1 @@ -56,7 +62,9 @@ ocr_fivebyeight() { } ocr_by_word() { - make gocr -C "$base_dir/runtime/tests" || exit 1 + if [[ ! -f "$base_dir/runtime/bin/gocr_wasm.so" ]]; then + make gocr -C "$base_dir/runtime/tests" || exit 1 + fi pushd "$base_dir/runtime/experiments/applications/ocr/by_word" || exit 1 ./install.sh || exit 1 ./run.sh || failed_tests+=("ocr_by_word") @@ -65,7 +73,9 @@ ocr_by_word() { } ocr_by_font() { - make gocr -C "$base_dir/runtime/tests" || exit 1 + if [[ ! -f "$base_dir/runtime/bin/gocr_wasm.so" ]]; then + make gocr -C "$base_dir/runtime/tests" || exit 1 + fi pushd "$base_dir/runtime/experiments/applications/ocr/by_font" || exit 1 ./install.sh || exit 1 ./run.sh || failed_tests+=("ocr_by_font") @@ -74,7 +84,9 @@ ocr_by_font() { } ocr_by_dpi() { - make gocr -C "$base_dir/runtime/tests" || exit 1 + if [[ ! -f "$base_dir/runtime/bin/gocr_wasm.so" ]]; then + make gocr -C "$base_dir/runtime/tests" || exit 1 + fi pushd "$base_dir/runtime/experiments/applications/ocr/by_dpi" || exit 1 ./install.sh || exit 1 ./run.sh || failed_tests+=("ocr_by_dpi")