Skip to content

Commit

Permalink
try skip build in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Nov 29, 2024
1 parent 7fc905e commit 6b3b488
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ jobs:
IMAGE_EXT=${{ matrix.extension }}
cache-from: type=gha,scope=${{ matrix.epics-target }}
cache-to: type=gha,mode=max,scope=${{ matrix.epics-target }}
tags: ci_test
tags: ci_test:latest
load: true

- 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: SKIP_BUILD=1 tests/run-tests.sh ci_test:latest

- name: Push developer image
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
Expand Down
7 changes: 3 additions & 4 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +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 \
$runtime --target $TARGET .
$docker build -t ${TAG} "${@}" --build-arg IMAGE_EXT=$IMAGE_EXT \
--target $TARGET .
4 changes: 2 additions & 2 deletions 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 Down

0 comments on commit 6b3b488

Please sign in to comment.