-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Circleci update #3049
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
Collatum-IT-GmbH-Admin
approved these changes
Jan 10, 2025
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
force-pushed
the
circleci-update
branch
from
January 14, 2025 16:11
92a5d18
to
94b6c02
Compare
th-2021
force-pushed
the
circleci-update
branch
from
January 14, 2025 16:21
d910a52
to
98235b9
Compare
@kkimurak fixed it. |
kkimurak
approved these changes
Jan 14, 2025
Closed
sachilles
approved these changes
Jan 17, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@th-2021 Sorry for being late. Thanks for your contribution. |
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.
Update circleci to use buildkit and large model.