Fix branch in merge-main-into-staging.yaml#432
Merged
Conversation
Contributor
PR SummaryThis pull request updates the GitHub Actions workflow configuration to change the branch that triggers the merge from 'simplify-merge-strategy' to 'main'. This ensures that any push to the 'main' branch will trigger the workflow to merge changes into the 'staging' branch. The permissions for the workflow remain unchanged, allowing write access to contents. Test Suggestions
|
Contributor
|
A PR preview is available: Preview URL |
nrichers
added a commit
that referenced
this pull request
Sep 23, 2024
* Fix staging deploy in Makefile (#428) * Simplify merge strategy for staging (#373) * Simplify merge strategy * Minor workflow tweaks * Switch to test branches * Add comment to trigger workflow * Add comment to trigger workflow * Add comment to trigger workflow * Switch to squash merge * Add comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Try --ff strategy * Add test comment to trigger workflow * Add test comment to trigger workflow * Revert to --no-ff strategy * Try reset --hard * Switch to --merge for PRs * Switch back to merge --no-ff * Try merge --ff again * Add test comment to trigger workflow * Switch back to merge --no-ff * Add test comment to trigger workflow * Switch back to squash merging for PRs * Add test comment to trigger workflow * Remove test comments * Revert to --merge for PRs * Testing PR#373 - push to branch from local * Add comment to trigger workflow * Add comment to trigger workflow * Add comment to trigger workflow * Switch to squash merge * Add comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Switch to --merge for PRs * Add test comment to trigger workflow * Add test comment to trigger workflow * Switch back to squash merging for PRs * Add test comment to trigger workflow * Remove test comments * Revert to --merge for PRs * Undo test changes * Undo test comment --------- Co-authored-by: Beck <[email protected]> * I'm dumb (#431) * Fix branch in merge-main-into-staging.yaml (#432) --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Beck <[email protected]>
validbeck
added a commit
that referenced
this pull request
Sep 23, 2024
* Fix staging deploy in Makefile (#428) * Simplify merge strategy for staging (#373) * Simplify merge strategy * Minor workflow tweaks * Switch to test branches * Add comment to trigger workflow * Add comment to trigger workflow * Add comment to trigger workflow * Switch to squash merge * Add comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Try --ff strategy * Add test comment to trigger workflow * Add test comment to trigger workflow * Revert to --no-ff strategy * Try reset --hard * Switch to --merge for PRs * Switch back to merge --no-ff * Try merge --ff again * Add test comment to trigger workflow * Switch back to merge --no-ff * Add test comment to trigger workflow * Switch back to squash merging for PRs * Add test comment to trigger workflow * Remove test comments * Revert to --merge for PRs * Testing PR#373 - push to branch from local * Add comment to trigger workflow * Add comment to trigger workflow * Add comment to trigger workflow * Switch to squash merge * Add comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Switch to --merge for PRs * Add test comment to trigger workflow * Add test comment to trigger workflow * Switch back to squash merging for PRs * Add test comment to trigger workflow * Remove test comments * Revert to --merge for PRs * Undo test changes * Undo test comment --------- Co-authored-by: Beck <[email protected]> * I'm dumb (#431) * Fix branch in merge-main-into-staging.yaml (#432) * Styled screenshots & cleaned up current screenshots (#420) * Added a .screenshot CSS class * Sample image * Changed class for About -releases * Changed class for Get Started & edited images to be uniform * Changed class for guides/configuration * Changed class for guides/model-workflows * Changed class for guides/model-inventory * Changed class for guides/model-documentation * Changed class for guides/model-validation * Changed class for guides/monitoring * Changed class for developer/ * Changed class for releases/ 1st pass * Cropped images for 2024-may-22 -1 gif * Reverting changes for a gif to crop again * Cropped images for releases 2nd pass * Cropped images for releases 3rd pass * Cropped images for releases 4th pass * More tweaks * Videos styling * Tweaks to JH quickstart * More cropping * Applied class to training * Annotated screenshots in guides/ * Currency field type (#423) * Preview of Generate with AI docs sections (#419) * Preview of Generate with AI docs sections * Release notes draft * Image edits * Editing release * Release notes done * Final tweaks + new gif * Oops I lied * anchor links --------- Co-authored-by: Nik Richers <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
nrichers
added a commit
that referenced
this pull request
Oct 3, 2024
* Fix staging deploy in Makefile (#428) * Simplify merge strategy for staging (#373) * Simplify merge strategy * Minor workflow tweaks * Switch to test branches * Add comment to trigger workflow * Add comment to trigger workflow * Add comment to trigger workflow * Switch to squash merge * Add comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Try --ff strategy * Add test comment to trigger workflow * Add test comment to trigger workflow * Revert to --no-ff strategy * Try reset --hard * Switch to --merge for PRs * Switch back to merge --no-ff * Try merge --ff again * Add test comment to trigger workflow * Switch back to merge --no-ff * Add test comment to trigger workflow * Switch back to squash merging for PRs * Add test comment to trigger workflow * Remove test comments * Revert to --merge for PRs * Testing PR#373 - push to branch from local * Add comment to trigger workflow * Add comment to trigger workflow * Add comment to trigger workflow * Switch to squash merge * Add comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Remove comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Add test comment to trigger workflow * Switch to --merge for PRs * Add test comment to trigger workflow * Add test comment to trigger workflow * Switch back to squash merging for PRs * Add test comment to trigger workflow * Remove test comments * Revert to --merge for PRs * Undo test changes * Undo test comment --------- Co-authored-by: Beck <[email protected]> * I'm dumb (#431) * Fix branch in merge-main-into-staging.yaml (#432) * Styled screenshots & cleaned up current screenshots (#420) * Added a .screenshot CSS class * Sample image * Changed class for About -releases * Changed class for Get Started & edited images to be uniform * Changed class for guides/configuration * Changed class for guides/model-workflows * Changed class for guides/model-inventory * Changed class for guides/model-documentation * Changed class for guides/model-validation * Changed class for guides/monitoring * Changed class for developer/ * Changed class for releases/ 1st pass * Cropped images for 2024-may-22 -1 gif * Reverting changes for a gif to crop again * Cropped images for releases 2nd pass * Cropped images for releases 3rd pass * Cropped images for releases 4th pass * More tweaks * Videos styling * Tweaks to JH quickstart * More cropping * Applied class to training * Annotated screenshots in guides/ * Currency field type (#423) * Preview of Generate with AI docs sections (#419) * Preview of Generate with AI docs sections * Release notes draft * Image edits * Editing release * Release notes done * Final tweaks + new gif * Oops I lied * anchor links * Added attachment field type (#442) * Added attachment field type * Wording tweak * Missed one * Pulling in latest from developer-framework PR#195 (#438) * Pulling in latest from developer-framework * Added .screenshot class to model inventory fields * Added aliases for index.html & training-overview.html (#444) * Docs: Work with metrics over time (#449) * WIP * Key concepts draft * Clarified monitoring instructions now w/ accurate default permissions * Final draft of Work with metrics over time * Adjusted Work with content blocks * Fixing display issue for test description listings on monitoring * Update site/guide/monitoring/work-with-metrics-over-time.qmd Co-authored-by: John Halz <[email protected]> --------- Co-authored-by: John Halz <[email protected]> * Templates for videos (#415) * Add docs.validmind.ai/training redirect * Update backgrounds, remove slide numbering, add slide links * Add initial presentation with sample intro slides * Add slides * Update video slides * Hide controls * Organize slides into sections by type * Minor update for adding tests * Calculation field instructions & example (#443) * Calculation field instructions & example * Tweak * Moved calculation screenshot into its own line * Added Juan's magic formula * Set up backfilled redirects for renamed pages (#454) * 1st pass of links that used to be on developer-framework * 1st pass of other external links to docs * 1st pass of newer renames * Big restructure of guides alias links 1st pass * Restructure of Documenting models 1st pass * 2nd pass of big restructure * Final pass of big restructure * Added alias redirects to style guide * Embed Validating Models 101 playlist into Guides section (#446) * Embed Validating Models 101 playlist into Guides section * Remove whitespace * Update site/guide/guides.qmd Co-authored-by: Beck <[email protected]> * Update site/guide/guides.qmd Co-authored-by: Beck <[email protected]> * Undo lead-in text for video --------- Co-authored-by: Beck <[email protected]> * Embed "How do I ... add tests?" video in developer docs (#450) * Add how do I add test video * Switch to iframe for video embed --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Beck <[email protected]> Co-authored-by: John Halz <[email protected]>
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.
Internal Notes for Reviewers
This PR fixes a test change that I forgot to undo.
External Release Notes