Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/Dockerfile.buildenv
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# rust_icu_buildenv.
ARG RUST_VERSION=1.82.0
ARG RUST_VERSION=1.90.0
FROM rust:$RUST_VERSION AS buildenv

ARG BINDGEN_CLI_VERSION=0.69.5
ARG BINDGEN_CLI_VERSION=0.72.1

RUN mkdir -p /src

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.testenv
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM $DOCKER_REPO/rust_icu_$ICU_VERSION_TAG:$VERSION AS buildenv
ARG DOCKER_REPO
ARG VERSION
ARG ICU_VERSION_TAG
ARG BINDGEN_CLI_VERSION=0.69.5
ARG BINDGEN_CLI_VERSION=0.72.1

# Mount the rust_icu source top level directory here.
ENV RUST_ICU_SOURCE_DIR=/src/rust_icu
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.testenv.current
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM $DOCKER_REPO/rust_icu_buildenv:$VERSION AS buildenv
ARG DOCKER_REPO
ARG VERSION
ARG ICU_VERSION_TAG
ARG BINDGEN_CLI_VERSION=0.69.5
ARG BINDGEN_CLI_VERSION=0.72.1

ENV CARGO_BUILD_DIR=/build/cargo
RUN mkdir -p $CARGO_BUILD_DIR
Expand Down
24 changes: 19 additions & 5 deletions build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ DOCKER_REPO ?= filipfilmar
all: \
push-buildenv.stamp \
latest.stamp \
v77.stamp \
v76.stamp \
v74.stamp \
v73.stamp \
v72.stamp \
Expand All @@ -45,15 +47,19 @@ build-%.stamp: Dockerfile.%
docker build \
--build-arg DOCKER_REPO=${DOCKER_REPO} \
--build-arg VERSION=${VERSION} \
-f $< -t rust_icu_$*:${VERSION} .
-f $< \
-t rust_icu_$*:${VERSION} \
.
touch $@

build-maint-%.stamp: Dockerfile.maint Dockerfile.buildenv
docker build \
--build-arg DOCKER_REPO=${DOCKER_REPO} \
--build-arg VERSION=${VERSION} \
--build-arg ICU_VERSION_TAG=maint/maint-$* \
-f $< -t rust_icu_maint-$*:${VERSION} .
-f $< \
-t rust_icu_maint-$*:${VERSION} \
.
touch $@

push-current.stamp: tag-current.stamp
Expand All @@ -71,7 +77,9 @@ build-current.stamp: Dockerfile.testenv.current \
--build-arg DOCKER_REPO=${DOCKER_REPO} \
--build-arg VERSION=${VERSION} \
--build-arg ICU_VERSION_TAG=maint-74 \
-f $< -t rust_icu_testenv-current:${VERSION} .
-f $< \
-t rust_icu_testenv-current:${VERSION} \
.
touch $@

build-testenv-%.stamp: Dockerfile.testenv Dockerfile.buildenv \
Expand All @@ -80,7 +88,9 @@ build-testenv-%.stamp: Dockerfile.testenv Dockerfile.buildenv \
--build-arg DOCKER_REPO=${DOCKER_REPO} \
--build-arg VERSION=${VERSION} \
--build-arg ICU_VERSION_TAG=maint-$* \
-f $< -t rust_icu_testenv-$*:${VERSION} .
-f $< \
-t rust_icu_testenv-$*:${VERSION} \
.
touch $@

tag-%.stamp: build-%.stamp
Expand All @@ -98,6 +108,10 @@ latest.stamp: push-buildenv.stamp v74.stamp
# files to be preserved, but it seems that only explicitly named files can be
# preserved. I.e. %.stamp doesn't work.
.PRECIOUS: \
push-maint-77.stamp push-testenv-77.stamp \
build-testenv-77.stamp tag-testenv-77.stamp \
push-maint-76.stamp push-testenv-76.stamp \
build-testenv-76.stamp tag-testenv-76.stamp \
push-maint-74.stamp push-testenv-74.stamp \
build-testenv-74.stamp tag-testenv-74.stamp \
push-maint-73.stamp push-testenv-73.stamp \
Expand All @@ -118,7 +132,7 @@ v%.stamp: push-maint-%.stamp push-testenv-%.stamp
# changes, and an unofficial tag. This target should not push.
test: Makefile \
build-buildenv.stamp tag-buildenv.stamp \
build-maint-74.stamp tag-maint-74.stamp \
build-maint-77.stamp tag-maint-77.stamp \
build-current.stamp tag-current.stamp
.PHONY: test