GitLab CI: Use Stackage Docker image #2805
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DigitalBrains1
force-pushed
the
ci-add-wget
branch
3 times, most recently
from
9a4c3b8 to
0541372
Compare
DigitalBrains1
changed the title
DigitalBrains1
force-pushed
the
ci-add-wget
branch
from
0541372 to
d74fea8
Compare
DigitalBrains1
force-pushed
the
ci-add-wget
branch
from
d74fea8 to
7414548
Compare
martijnbastiaan
approved these changes
Dec 5, 2024
DigitalBrains1
force-pushed
the
ci-add-wget
branch
from
7414548 to
8a3644b
Compare
It no longer uses our own Docker CI image, and doesn't run `.ci/setup.sh`. Further housekeeping: 1. Extract `CLASH_DOCKER_TAG` and `CACHE_BUST_TOKEN` from `image`, `CACHE_FALLBACK_KEY` and `cache.key` tokens/vars, so there is a single place to change them, as otherwise I would have added another place to keep the bust token synchronized. 2. Add Docker images for GHC 9.10.1 to builder script. 3. An overlapping `apt-get install` in building the Docker images has been removed; every `build-$tool` image starts from the `builder` image, so it will already have what is in `DEPS_COMMON` installed, adding it to `DEPS_$tool` is redundant and a no-op. This means DEPS_VERILATOR doesn't need zlib1g-dev. The other dependencies have been sorted alphabetically. There are still no-ops (such as zlib1g-dev implying zlib1g already), but no outright overlap. 4. All GHC's have been bumped to their latest minor; same for the base Ubuntu Docker image.
DigitalBrains1
force-pushed
the
ci-add-wget
branch
from
8a3644b to
01c8bdd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It no longer uses our own Docker CI image, and doesn't run
.ci/setup.sh.Further housekeeping:
Extract
CLASH_DOCKER_TAGandCACHE_BUST_TOKENfromimage,CACHE_FALLBACK_KEYandcache.keytokens/vars, so there is a single place to change them, as otherwise I would have added another place to keep the bust token synchronized.Add Docker images for GHC 9.10.1 to builder script.
An overlapping
apt-get installin building the Docker images has been removed; everybuild-$toolimage starts from thebuilderimage, so it will already have what is inDEPS_COMMONinstalled, adding it toDEPS_$toolis redundant and a no-op. This means DEPS_VERILATOR doesn't need zlib1g-dev. The other dependencies have been sorted alphabetically.There are still no-ops (such as zlib1g-dev implying zlib1g already), but no outright overlap.
All GHC's have been bumped to their latest minor; same for the base Ubuntu Docker image.