Skip to content

Commit f9836d3

Browse files
committed
Merge remote-tracking branch 'origin/master' into releases/v2
2 parents 85270a1 + 83fb340 commit f9836d3

File tree

7 files changed

+1164
-3377
lines changed

7 files changed

+1164
-3377
lines changed

.github/workflows/pr_check_windows_container_pubprofile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ jobs:
9191
with:
9292
app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
9393
publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
94-
images: ${{ env.CONTAINER_REGISTRY }}/containerwebapp/canaryreplica:latest
94+
images: ${{ env.CONTAINER_REGISTRY }}/containerwebapp/canaryreplica:latest

lib/Utilities/PublishProfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PublishProfile {
3030
throw new Error("Publish profile does not contain kudu URL");
3131
}
3232
this._creds.uri = `https://${this._creds.uri}`;
33-
this._kuduService = new azure_app_kudu_service_1.Kudu(this._creds.uri, this._creds.username, this._creds.password);
33+
this._kuduService = new azure_app_kudu_service_1.Kudu(this._creds.uri, { username: this._creds.username, password: this._creds.password });
3434
}
3535
catch (error) {
3636
core.error("Failed to fetch credentials from Publish Profile. For more details on how to set publish profile credentials refer https://aka.ms/create-secrets-for-GitHub-workflows");

lib/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ function main() {
5656
isDeploymentSuccess = false;
5757
if (error.statusCode == 403) {
5858
core.setFailed("The deployment to your web app failed with HTTP status code 403. \
59-
Your web app may have networking features enabled which are blocking access (such as Private Endpoints).\
60-
For more information, please follow https://aka.ms/forbidden-deployment-error");
59+
Your web app may have networking features enabled which are blocking access (such as Private Endpoints). \
60+
For more information about deploying to virtual network integrated web apps, please follow https://aka.ms/gha/deploying-to-network-secured-sites");
6161
}
6262
else {
6363
core.setFailed("Deployment Failed, " + error);

0 commit comments

Comments
 (0)