Skip to content

Commit 11279bf

Browse files
committed
Add local Docker image build step for CI environment
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 36c8dca commit 11279bf

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,11 @@ jobs:
239239
repo: 'com_github_bytecodealliance_wasmtime'
240240
os: ubuntu-24.04-16core
241241
arch: s390x
242+
platform: linux/s390x
242243
action: test
243244
flags: --config=clang --test_timeout=1800
244245
# s390x build-tools image built from bazel/external/Dockerfile.bazel
245-
run_under: docker run --rm --env HOME=$HOME --env USER=$(id -un) --volume "$HOME:$HOME" --workdir $(pwd) --user $(id -u):$(id -g) --platform linux/s390x ghcr.io/proxy-wasm/build-tools:ubuntu-22.04-bazel-6.5.0
246+
run_under: docker run --rm --env HOME=$HOME --env USER=$(id -un) --volume "$HOME:$HOME" --workdir $(pwd) --user $(id -u):$(id -g) --platform linux/s390x proxy-wasm/build-tools:local-ci
246247
cache: true
247248
- name: 'Wasmtime on macOS/x86_64'
248249
engine: 'wasmtime'
@@ -298,6 +299,10 @@ jobs:
298299
echo "filegroup(name = \"$i\", srcs = [\"$i.wasm\"])" >> test/test_data/BUILD; \
299300
done
300301
302+
- name: Build local Docker image
303+
if: ${{ startsWith(matrix.run_under, 'docker') }}
304+
run: docker build --platform ${{ matrix.platform }} -f bazel/external/Dockerfile.bazel -t proxy-wasm/build-tools:local-ci .
305+
301306
- name: Bazel build/test
302307
shell: bash
303308
run: >

bazel/external/Dockerfile.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN apt install -y software-properties-common
4444
RUN add-apt-repository ppa:openjdk-r/ppa
4545
RUN apt install -y \
4646
build-essential \
47-
openjdk-11-jdk \
47+
openjdk-21-jdk \
4848
python3 \
4949
curl \
5050
zip \

0 commit comments

Comments
 (0)