Skip to content

Commit

Permalink
fix cache for runtest.sh in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Nov 29, 2024
1 parent c27fd8d commit d8e73f7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion template/build
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fi
# make sure new repos get their submodule ibek-support
if [ ! -d ibek-support/_global ] ; then git submodule update --init ; fi

# build and developer images
# build runtime or developer image
set -x
$docker build -t ${TAG} "${@}" --build-arg IMAGE_EXT=$IMAGE_EXT \
--target $TARGET .
6 changes: 2 additions & 4 deletions template/tests/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ fi
cd ${ROOT}

# if a tag was passed in this implies it was already built
export TAG=${TAG:-localhost/ec_test}
if [[ ${TAG} == "localhost/ec_test" ]] ; then TARGET=runtime ./build; fi
export TAG=${TAG:-ec_test}
if [[ ${TAG} == "ec_test" ]] ; then TARGET=runtime ./build; fi

# try out a test ibek config IOC instance with the generic IOC
opts="--rm --security-opt=label=disable -v ${THIS}/config:${CONF}"
Expand All @@ -40,5 +40,3 @@ fi

echo "Tests passed!"



Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Test image
# can't test non native without some hardware to run on
if: ${{ matrix.epics-target == 'linux-x86_64' }}
run: tests/run-tests.sh
run: tests/run-tests.sh ci_test

- name: Push developer image
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
Expand Down

0 comments on commit d8e73f7

Please sign in to comment.