Skip to content

Commit acdee0b

Browse files
committed
feat: update the docker buildenv
- Updated rust version to 1.90.x - Updated bindgen version to 0.72.x - Added buildenvs for ICU 76 and 77 (we skipped 75, sigh)
1 parent 30d9278 commit acdee0b

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

build/Dockerfile.buildenv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# rust_icu_buildenv.
2-
ARG RUST_VERSION=1.82.0
2+
ARG RUST_VERSION=1.90.0
33
FROM rust:$RUST_VERSION AS buildenv
44

5-
ARG BINDGEN_CLI_VERSION=0.69.5
5+
ARG BINDGEN_CLI_VERSION=0.72.1
66

77
RUN mkdir -p /src
88

build/Dockerfile.testenv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM $DOCKER_REPO/rust_icu_$ICU_VERSION_TAG:$VERSION AS buildenv
77
ARG DOCKER_REPO
88
ARG VERSION
99
ARG ICU_VERSION_TAG
10-
ARG BINDGEN_CLI_VERSION=0.69.5
10+
ARG BINDGEN_CLI_VERSION=0.72.1
1111

1212
# Mount the rust_icu source top level directory here.
1313
ENV RUST_ICU_SOURCE_DIR=/src/rust_icu

build/Dockerfile.testenv.current

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM $DOCKER_REPO/rust_icu_buildenv:$VERSION AS buildenv
77
ARG DOCKER_REPO
88
ARG VERSION
99
ARG ICU_VERSION_TAG
10-
ARG BINDGEN_CLI_VERSION=0.69.5
10+
ARG BINDGEN_CLI_VERSION=0.72.1
1111

1212
ENV CARGO_BUILD_DIR=/build/cargo
1313
RUN mkdir -p $CARGO_BUILD_DIR

build/Makefile

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ DOCKER_REPO ?= filipfilmar
2222
all: \
2323
push-buildenv.stamp \
2424
latest.stamp \
25+
v77.stamp \
26+
v76.stamp \
2527
v74.stamp \
2628
v73.stamp \
2729
v72.stamp \
@@ -45,15 +47,19 @@ build-%.stamp: Dockerfile.%
4547
docker build \
4648
--build-arg DOCKER_REPO=${DOCKER_REPO} \
4749
--build-arg VERSION=${VERSION} \
48-
-f $< -t rust_icu_$*:${VERSION} .
50+
-f $< \
51+
-t rust_icu_$*:${VERSION} \
52+
.
4953
touch $@
5054

5155
build-maint-%.stamp: Dockerfile.maint Dockerfile.buildenv
5256
docker build \
5357
--build-arg DOCKER_REPO=${DOCKER_REPO} \
5458
--build-arg VERSION=${VERSION} \
5559
--build-arg ICU_VERSION_TAG=maint/maint-$* \
56-
-f $< -t rust_icu_maint-$*:${VERSION} .
60+
-f $< \
61+
-t rust_icu_maint-$*:${VERSION} \
62+
.
5763
touch $@
5864

5965
push-current.stamp: tag-current.stamp
@@ -71,7 +77,9 @@ build-current.stamp: Dockerfile.testenv.current \
7177
--build-arg DOCKER_REPO=${DOCKER_REPO} \
7278
--build-arg VERSION=${VERSION} \
7379
--build-arg ICU_VERSION_TAG=maint-74 \
74-
-f $< -t rust_icu_testenv-current:${VERSION} .
80+
-f $< \
81+
-t rust_icu_testenv-current:${VERSION} \
82+
.
7583
touch $@
7684

7785
build-testenv-%.stamp: Dockerfile.testenv Dockerfile.buildenv \
@@ -80,7 +88,9 @@ build-testenv-%.stamp: Dockerfile.testenv Dockerfile.buildenv \
8088
--build-arg DOCKER_REPO=${DOCKER_REPO} \
8189
--build-arg VERSION=${VERSION} \
8290
--build-arg ICU_VERSION_TAG=maint-$* \
83-
-f $< -t rust_icu_testenv-$*:${VERSION} .
91+
-f $< \
92+
-t rust_icu_testenv-$*:${VERSION} \
93+
.
8494
touch $@
8595

8696
tag-%.stamp: build-%.stamp
@@ -98,6 +108,10 @@ latest.stamp: push-buildenv.stamp v74.stamp
98108
# files to be preserved, but it seems that only explicitly named files can be
99109
# preserved. I.e. %.stamp doesn't work.
100110
.PRECIOUS: \
111+
push-maint-77.stamp push-testenv-77.stamp \
112+
build-testenv-77.stamp tag-testenv-77.stamp \
113+
push-maint-76.stamp push-testenv-76.stamp \
114+
build-testenv-76.stamp tag-testenv-76.stamp \
101115
push-maint-74.stamp push-testenv-74.stamp \
102116
build-testenv-74.stamp tag-testenv-74.stamp \
103117
push-maint-73.stamp push-testenv-73.stamp \
@@ -118,7 +132,7 @@ v%.stamp: push-maint-%.stamp push-testenv-%.stamp
118132
# changes, and an unofficial tag. This target should not push.
119133
test: Makefile \
120134
build-buildenv.stamp tag-buildenv.stamp \
121-
build-maint-74.stamp tag-maint-74.stamp \
135+
build-maint-77.stamp tag-maint-77.stamp \
122136
build-current.stamp tag-current.stamp
123137
.PHONY: test
124138

0 commit comments

Comments
 (0)