Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

ci: merge docker images #35078

Merged
merged 7 commits into from
Feb 7, 2024
Merged

Conversation

yihau
Copy link
Contributor

@yihau yihau commented Feb 5, 2024

Problem

  1. If we only upgraded rust for the stable version, we will need to hack the nightly image to ensure compatibility with both the old stable version and the new stable version for transferring to avoid enforcing everyone to rebase master.
  2. we have already use rust-toolchain.toml and ci/rust-version.sh to specify version. it should be okay to have a all-in-one ci docker environment.

Summary of Changes

  1. merge stable and nightly docker images into a single docker image. the new name is solanalabs/ci:rust_${stable_version}_${nightly_version}
  2. add a new docker-run script to simplify pipeline script.

@yihau yihau force-pushed the merge-ci-docker-image branch from 044cadd to f33a3db Compare February 5, 2024 11:03
@yihau yihau force-pushed the merge-ci-docker-image branch from f33a3db to 0bd2c85 Compare February 5, 2024 11:16
@yihau yihau marked this pull request as ready for review February 5, 2024 16:19
@t-nelson
Copy link
Contributor

t-nelson commented Feb 6, 2024

any corresponding changes needed to the update instructions in ci/docker-rust*/README.md?

@yihau
Copy link
Contributor Author

yihau commented Feb 6, 2024

yeah. I thought to remove all of them in another PR but seems that it's better to get them all happen here! will push them later!

@t-nelson
Copy link
Contributor

t-nelson commented Feb 6, 2024

yeah. I thought to remove all of them in another PR but seems that it's better to get them all happen here! will push them later!

nice. thanks!

Copy link
Contributor

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

Copy link

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a16f982) 81.6% compared to head (ec6ad00) 81.6%.
Report is 14 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #35078   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         830      830           
  Lines      225019   225019           
=======================================
+ Hits       183675   183754   +79     
+ Misses      41344    41265   -79     

@yihau yihau merged commit 8363ebf into solana-labs:master Feb 7, 2024
31 checks passed
@yihau yihau deleted the merge-ci-docker-image branch February 7, 2024 07:17
@solana-labs solana-labs deleted a comment from TESLA-SATI Apr 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants