Skip to content

Commit

Permalink
Fix merge failures and re-trigger pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
snehapar9 committed Nov 7, 2023
1 parent 6cb173e commit fd223cc
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 160 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/run-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,6 @@ jobs:
TEST_NEW_CONTAINER_APP_ENV: 'gh-ca-is-ne-${{ github.run_id }}-env'

steps:
- name: Clone azure-cli-extensions repo
uses: actions/checkout@v3
with:
repository: snehapar9/azure-cli-extensions
path: azure-cli-extensions

- name: Install latest azure-cli-extensions wheel
run: az extension add --source '${{ github.workspace }}/azure-cli-extensions/containerapp-0.3.42-py2.py3-none-any.whl' --yes
- name: Checkout action repository
uses: actions/checkout@v3

Expand Down Expand Up @@ -438,11 +430,6 @@ jobs:
imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }}
disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }}

- name: Delete pushed image
if: ${{ always() }}
shell: bash
run: az acr repository delete -n ${{ vars.TEST_ACR_NAME }} -t ${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} -y

- name: Update Container App with existing image
if: ${{ always() }}
shell: bash
Expand Down
4 changes: 0 additions & 4 deletions azurecontainerapps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -564,10 +564,6 @@ export class azurecontainerapps {
await this.appHelper.updateContainerAppRegistryDetails(this.containerAppName, this.resourceGroup, this.registryUrl, this.registryUsername, this.registryPassword);
}

if(!this.util.isNullOrEmpty(this.appSourcePath) && this.useCliToBuildAndPushImage) {
this.commandLineArgs.push(`--source ${this.appSourcePath}`);
}

// Update the Container App using the 'update' command
await this.appHelper.updateContainerApp(this.containerAppName, this.resourceGroup, this.commandLineArgs);
} else {
Expand Down
Loading

0 comments on commit fd223cc

Please sign in to comment.