Sync Branches CI fix #1246
Merged
Sync Branches CI fix #1246
Conversation
This file contains hidden or 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
kantagara
approved these changes
Nov 28, 2024
sneakzttv
approved these changes
Dec 2, 2024
juans-chainsafe
approved these changes
Dec 2, 2024
rob1997
added a commit
that referenced
this pull request
Jan 16, 2025
* changed checkout ref to target and added base input * test run * workflow file ref changed * change the base branch since main and dev are upto date * added some logs for debugging * more logs * check with correct inputs * logs and added fetch just in case * cutting my losses and trying a third party action * skip ci added * skip CI inputs added * remove required from skip_ci input * apparently $ runs commands in bash * maybe pipe it * cutting my loses again * trying some stuff * trying something from stackoverflow * small edits * smaller edits * bash is so weird * message formatting * input options implemented * typo fix * more typo fixes :facepalm * reverted testing refs * typo fix * checking regular git commands if they work * logs and fetch * log latest commit * changed checkout branch at step removed branch log * log last commit command replaced * log status * checkout at base branch * added git branch to find base branch * trying more combinations * updated dev PR checks to trigger with multiple labels * setup now uses a proper command line parser * updated workflows with new command line parameters * updated local scripts with new arguments * text formatting * updated release argument * -r is also already in use, --deploy * typo fix * arguments fix for sync verb * fixed skip ci option * changed setup ref * typo fix * fixing some parsing issues * added a . at the end of path because git isn't finding path * logging and trying something I found on git * more logs and messing with directory * fixed path * allow unrelated histories * empty trigger * more logging * typo fixed * trial without exclusion logic * reverted changes * added git log on checkout * reverted log * added some merge options * merging the other way * reverted reverse merging * check if history is related * checking target's last commits * more logs * one line logging * GH actions is running one commit branches :faceplam * what happens if I force pull do I get all the commits? * TIL GitHub only fetches one commit from head by default * revert back testing changes * added back config input for sync dependencies * ci shouldn't be skipped on dev (for extra commits)
sergeypanin1994
pushed a commit
to sergeypanin1994/web3.unity
that referenced
this pull request
Mar 16, 2025
* changed checkout ref to target and added base input * test run * workflow file ref changed * change the base branch since main and dev are upto date * added some logs for debugging * more logs * check with correct inputs * logs and added fetch just in case * cutting my losses and trying a third party action * skip ci added * skip CI inputs added * remove required from skip_ci input * apparently $ runs commands in bash * maybe pipe it * cutting my loses again * trying some stuff * trying something from stackoverflow * small edits * smaller edits * bash is so weird * message formatting * input options implemented * typo fix * more typo fixes :facepalm * reverted testing refs * typo fix * checking regular git commands if they work * logs and fetch * log latest commit * changed checkout branch at step removed branch log * log last commit command replaced * log status * checkout at base branch * added git branch to find base branch * trying more combinations * updated dev PR checks to trigger with multiple labels * setup now uses a proper command line parser * updated workflows with new command line parameters * updated local scripts with new arguments * text formatting * updated release argument * -r is also already in use, --deploy * typo fix * arguments fix for sync verb * fixed skip ci option * changed setup ref * typo fix * fixing some parsing issues * added a . at the end of path because git isn't finding path * logging and trying something I found on git * more logs and messing with directory * fixed path * allow unrelated histories * empty trigger * more logging * typo fixed * trial without exclusion logic * reverted changes * added git log on checkout * reverted log * added some merge options * merging the other way * reverted reverse merging * check if history is related * checking target's last commits * more logs * one line logging * GH actions is running one commit branches :faceplam * what happens if I force pull do I get all the commits? * TIL GitHub only fetches one commit from head by default * revert back testing changes * added back config input for sync dependencies * ci shouldn't be skipped on dev (for extra commits)
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.
- Note :- It doesn't resolve conflicts and we're likely to run into them since we're updating dependencies via CI on both branches so at the very least library folders with dlls will have conflictNow we got an exclusion path list