Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Circleci update #3049

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Circleci update #3049

merged 2 commits into from
Jan 17, 2025

Conversation

th-2021
Copy link
Contributor

@th-2021 th-2021 commented Jan 10, 2025

Update circleci to use buildkit and large model.

@kkimurak
Copy link
Contributor

Generally looks good. I think it would be better to cleanup git log so that only contains commits for .circleci/config.yml

$ git switch circleci-update

# show changes 
$ git log --oneline master..circleci-update -- .circleci/config.yml
f0665168 (th-2021/multistage) do a standard build for comparison
2de835ee change back to better match master
0fa2518f simplify
738eecd0 add image
d7225209 set buildkit variable
05622753 add buildkit parameter
9a9ede57 use buildkit
6944ffdf remove parallelism; upgrade docker orb
8362e0ec add parallelism
69af74d0 add MAX_OLD_SPACE=8192
d9f882d5 set larger resource class; change to buildx; all for th-2021

$ git reset --hard master

# apply each commits - we need to reverse display order as newer commit comes first by default
# rev-list is used to show only full commit hash instead of log
$ git rev-list master..circleci-update --reverse -- .circleci/ | xargs git cherry-pick

# Conflict may occurs when cherry-picking 2de835ee
# as it contains changes to assets/runtime/function and Dockerfile.multistage
# Simply ignore here
$ git reset Dockerfile.multistage assets/runtime/function

# Continue and cherry-pick the remaining commits
$ git cherry-pick --continue

# Now, commit history for branch circleci-update only contains changes to .circleci/config.yml
# Push it
$ git push --force

@th-2021
Copy link
Contributor Author

th-2021 commented Jan 14, 2025

@kkimurak fixed it.

@kkimurak kkimurak mentioned this pull request Jan 15, 2025
Copy link
Collaborator

@sachilles sachilles left a comment

Choose a reason for hiding this comment

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

LGTM

@sachilles
Copy link
Collaborator

@th-2021 Sorry for being late. Thanks for your contribution.

@sachilles sachilles merged commit 4f977fe into sameersbn:master Jan 17, 2025
3 checks passed
@th-2021 th-2021 deleted the circleci-update branch January 19, 2025 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants