Skip to content

Fix: CI issue where branch names containing 'bootstrap' #4417

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 10, 2025
Merged

Fix: CI issue where branch names containing 'bootstrap' #4417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef58d8f
fix: update condition for Azure and ACR login to check for 'make boot…
ShakutaiGit Mar 10, 2025
d1d1c1e
fix: resolve CI issue with Azure login steps for branches containing …
ShakutaiGit Mar 10, 2025
0988a78
Merge branch 'main' of https://github.com/microsoft/AzureTRE into fix…
ShakutaiGit Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/devcontainer_run_command/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@ runs:

- name: Azure Login
uses: azure/login@v2
if: contains(inputs.COMMAND, 'bootstrap') != true
if: contains(inputs.COMMAND, 'make bootstrap') != true
with:
creds: ${{ inputs.AZURE_CREDENTIALS }}
environment: "${{ env.AZURE_ENVIRONMENT }}"

- name: ACR Login
shell: bash
if: contains(inputs.COMMAND, 'bootstrap') != true
if: contains(inputs.COMMAND, 'make bootstrap') != true
run: |
az acr login --name "${{ inputs.CI_CACHE_ACR_NAME }}"

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ BUG FIXES:
* Fix the management storage access error while executing `make show-core-output` command, and remove redundant error messages from `mgmtstorage_enable_public_access.sh` script ([#4404](https://github.com/microsoft/AzureTRE/issues/4404))
* Fix retry loop in devcontainer action and override commands.sh [#4409](https://github.com/microsoft/AzureTRE/pull/4409)
* Fix terraform output command by adding working directory parameterPR ([#4413](https://github.com/microsoft/AzureTRE/pull/4413)) [#4412](https://github.com/microsoft/AzureTRE/issues/4412)
* Fix CI issue where branch names containing 'bootstrap' would incorrectly skip Azure login steps [#4416](https://github.com/microsoft/AzureTRE/issues/4416) ([#4417](https://github.com/microsoft/AzureTRE/pull/4417))

## 0.21.0

Expand Down
Loading