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

[feature/PI-601] Set branch ref to main if branch has been deleted on workspace delete #401

Merged
merged 1 commit into from
Nov 18, 2024

Conversation

jameslinnell
Copy link
Contributor

No description provided.

@jameslinnell jameslinnell requested a review from a team as a code owner November 8, 2024 13:50
@@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ env.BRANCH_NAME }}
ref: ${{ env.BRANCH_NAME || 'main' }}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

So because the branch gets deleted it needs to run the build in "main". If it's just a regular close of PR this will remain on the branch name.

Copy link
Contributor

Choose a reason for hiding this comment

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

I presume that env.BRANCH_NAME isn't empty (otherwise the step below destroy--redundant-workspaces BRANCH_NAME=origin/${{ env.BRANCH_NAME }} wouldn't work)

think that means that ${{ env.BRANCH_NAME || 'main' }} will never evaluate to main?

Copy link
Contributor

Choose a reason for hiding this comment

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

what happens if the branch doesn't exist, does it fail? if so could use

    if: ${{ failure() }}

to catch a failed checkout, and then checkout main instead

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So BRANCH_NAME will have a value. As it's coming from the pull request. For definite. That's how destroy--redundant-workspaces BRANCH_NAME=origin/${{ env.BRANCH_NAME }} will still work as in this script the branch name is used to determine the workspace name.

But the point is if the branch doesn't exist as a branch then it will fallback to main.

Apparently this works. But I'm more than happy to concede there is an element of doubt.
There is someone asking for it to be a feature actions/checkout#512 back in 2021 and at the bottom there is someone showing a different option.

@@ -41,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ env.BRANCH_NAME }}
ref: ${{ env.BRANCH_NAME || 'main' }}
Copy link
Contributor Author

@jameslinnell jameslinnell Nov 8, 2024

Choose a reason for hiding this comment

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

So because the branch gets deleted it needs to run the build in "main". If it's just a regular close of PR this will remain on the branch name.
However this is only building the environment.
On line 49 below it is still using the original branch name to destroy the workspace

@jameslinnell jameslinnell changed the title [feature/PI-601] Set branch ref to main if branch has been deleted [feature/PI-601] Set branch ref to main if branch has been deleted on workspace delete Nov 8, 2024
@jameslinnell jameslinnell force-pushed the feature/PI-601-workspace_destroy branch from cf01e74 to 43dbc97 Compare November 13, 2024 10:34
@jameslinnell jameslinnell force-pushed the feature/PI-601-workspace_destroy branch from 43dbc97 to 42d85de Compare November 18, 2024 09:34
@jameslinnell jameslinnell merged commit 42d85de into main Nov 18, 2024
21 of 22 checks passed
@jameslinnell jameslinnell deleted the feature/PI-601-workspace_destroy branch November 18, 2024 14:13
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.

2 participants