chore(IDX): update README, introduce git flow#131
Merged
Conversation
basvandijk
approved these changes
Apr 23, 2025
cgundy
added a commit
that referenced
this pull request
Apr 23, 2025
* chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch>
Merged
cgundy
added a commit
that referenced
this pull request
Apr 24, 2025
* Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch>
cgundy
added a commit
that referenced
this pull request
Apr 24, 2025
* Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * chore(IDX): update cla workflow --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch>
cgundy
added a commit
that referenced
this pull request
Apr 29, 2025
* Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * Chore: removes unused checkout (#141) * refactor(IDX): replace checkout with github action * remove test * add mock * fix test * update * update * mock gh login * update test * remove * set use_rest_api --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> Co-authored-by: Jan Wendling <7381150+jwndlng@users.noreply.github.com>
cgundy
added a commit
that referenced
this pull request
Apr 29, 2025
* Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * Chore: removes unused checkout (#141) * fix(IDX): update bot check workflow --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> Co-authored-by: Jan Wendling <7381150+jwndlng@users.noreply.github.com>
cgundy
added a commit
that referenced
this pull request
Apr 29, 2025
* chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) * refactor(IDX): update bot policies workflow (#134) * Merge Develop Into Main (#132) (#136) * Merge main into develop (#140) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): update cla workflow (#139) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * chore(IDX): update cla workflow --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * refactor(IDX): replace checkout with github action (#142) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * Chore: removes unused checkout (#141) * refactor(IDX): replace checkout with github action * remove test * add mock * fix test * update * update * mock gh login * update test * remove * set use_rest_api --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> Co-authored-by: Jan Wendling <7381150+jwndlng@users.noreply.github.com> * chore(IDX): fix bot workflow (#143) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * Chore: removes unused checkout (#141) * fix(IDX): update bot check workflow --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> Co-authored-by: Jan Wendling <7381150+jwndlng@users.noreply.github.com> * change branch * update branch * add debug (#145) * debug * debug * Update check_is_bot.yml * Update check_is_bot.yml * change it back * Update check_is_bot.yml * debug * Update check_is_bot.yml * Update check_is_bot.yml * test * execute main * check if still needed * keep * remove pin to develop * remove debug --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> Co-authored-by: Jan Wendling <7381150+jwndlng@users.noreply.github.com>
cgundy
added a commit
that referenced
this pull request
Apr 30, 2025
* chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) * refactor(IDX): update bot policies workflow (#134) * Merge Develop Into Main (#132) (#136) * Merge main into develop (#140) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): update cla workflow (#139) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * chore(IDX): update cla workflow --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * refactor(IDX): replace checkout with github action * remove test * add mock * fix test * update * update * mock gh login * update test * remove * set use_rest_api --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch>
cgundy
added a commit
that referenced
this pull request
Apr 30, 2025
* chore(IDX): replace changed files step with gh action (#155) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) * refactor(IDX): update bot policies workflow (#134) * Merge Develop Into Main (#132) (#136) * Merge main into develop (#140) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): update cla workflow (#139) * Merge Develop Into Main (#132) * chore(IDX): update README, introduce git flow (#131) * refactor(IDX): change triggers (#130) * refactor(IDX): change triggers * Update .github/workflows/internal_vs_external.yml Co-authored-by: Bas van Dijk <bas@van.dijk.ch> --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): combine workflow files (#129) * refactor(IDX): rename workflows (#133) --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * chore(IDX): refactor bot policies (#138) * chore(IDX): update cla workflow --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * refactor(IDX): replace checkout with github action * remove test * add mock * fix test * update * update * mock gh login * update test * remove * set use_rest_api --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch> * Update repo_policies.yml * Update check_is_bot.yml * split by whitespace * update test * remove pin to develop * remove pin to develop --------- Co-authored-by: Bas van Dijk <bas@van.dijk.ch>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This change introduces git flow, so that changes can first be tested on the
developbranch before releasing to the production workflows.For context, we previously tried merging directly to main, then creating new releases via tags, but this caused a lot of disruption for developers, as new tags caused old workflows to become "stuck" and needed to be re-triggered.