Skip to content

Commit

Permalink
fix build script and remove aarch64
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Mar 8, 2024
1 parent 2b0ccd7 commit 809781c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
epics-target: [RTEMS-beatnik, linux-x86_64, linux-aarch64]
epics-target: [RTEMS-beatnik, linux-x86_64] # , linux-aarch64]
target: [developer, runtime]
include:
- epics-target: RTEMS-beatnik
Expand All @@ -29,12 +29,12 @@ jobs:
platform: linux/amd64
os: ubuntu-latest

- epics-target: linux-aarch64
epics-host: linux-aarch64
# a temporary name until multi-arch is supported
extension: -native-aarch64
platform: linux/arm64
os: ubuntu-latest
# - epics-target: linux-aarch64
# epics-host: linux-aarch64
# # a temporary name until multi-arch is supported
# extension: -native-aarch64
# platform: linux/arm64
# os: ubuntu-latest

runs-on: ${{ matrix.os }}
env:
Expand Down
18 changes: 12 additions & 6 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
# generic local build script for epics-containers repositories #
################################################################################

# log commands and stop on errors
set -xe

# set TARGET_ARCHITECTURE to rtems for RTEMS based targets
T_A=${TARGET_ARCHITECTURE:-linux}
T_A=${TARGET_ARCHITECTURE:-linux_x86_64}
# set TARGET to runtime for runtime images
TARGET=${TARGET:-developer}
# set TAG to override the default tag
TAG=${TAG:-ec_test}

# log commands and stop on errors
set -xe
if [[ ${T_A} != "linux_x86_64" ]]; then
# container image extension is the lcase of TARGET_ARCHITECTURE
IMAGE_EXT=-"${T_A,,}"
fi

cd $(dirname ${0})

Expand All @@ -24,5 +28,7 @@ if $docker buildx version &>/dev/null; then builx=buildx; load=--load; fi
if [ ! -d ibek-support ] ; then git submodule update --init ; fi

# build and developer images
$docker build $buildx -t ${TAG} --build-arg \
TARGET_ARCHITECTURE=$T_A $load --target $TARGET .
$docker build $buildx -t ${TAG} "${@}" $load \
--build-arg TARGET_ARCHITECTURE=$T_A \
--build-arg IMAGE_EXT=$IMAGE_EXT \
--target $TARGET .

0 comments on commit 809781c

Please sign in to comment.