vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reproducible build: Bump to Rust 1.59 and Alpine 3.15 

The Rust upgrade is necessary since our Cargo.lock file now requires
`ed25519` 1.4.0, which requires edition2021, which requires Rust
1.56 or later.

The Alpine upgrade is opportunistic: we might as well.

I've also added comments to remind us to keep the .gitlab-ci.yml
and docker_reproducible_build files in sync, since my first version
of this commit messed that up.

Closes #376.
This commit is contained in:
Nick Mathewson 2022-03-04 08:22:57 -05:00
parent b27ffe14fb
commit e15c47f762
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -115,7 +115,8 @@ build-repro:
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG != null - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG != null
stage: build stage: build
image: rust:1.54.0-alpine3.14 # If you upgrade this image, also change the one in docker_reproducible_build
image: rust:1.59.0-alpine3.15
script: script:
- ./maint/reproducible_build linux windows macos - ./maint/reproducible_build linux windows macos
artifacts: artifacts:

5
maint/docker_reproducible_build
View File

@ -6,6 +6,9 @@
## use a fixed image to not suffer from image retaging when newer rustc or ## use a fixed image to not suffer from image retaging when newer rustc or
## alpine emerges. Increase shm size for the reasons described in ## alpine emerges. Increase shm size for the reasons described in
## reproducible_build ## reproducible_build
##
## If you change this image, make sure also to change the one listed in
## the build-repro job in .gitlab-ci.yml
exec docker run --rm -i -v "$(git rev-parse --show-toplevel)":/builds/arti \ exec docker run --rm -i -v "$(git rev-parse --show-toplevel)":/builds/arti \
-w /builds/arti --shm-size=512m rust:1.54.0-alpine3.14 \ -w /builds/arti --shm-size=512m rust:1.59.0-alpine3.15 \
./maint/reproducible_build "$@" ./maint/reproducible_build "$@"