Skip to content

Commit 73732aa

Browse files
authored
Merge pull request #777 from Azure/main
anf branch sync
2 parents d4e6dc6 + c34f103 commit 73732aa

File tree

13 files changed

+8767
-2352
lines changed

13 files changed

+8767
-2352
lines changed

.github/workflows/compile-bicep-arm-targeted.yml

Lines changed: 0 additions & 79 deletions
This file was deleted.

.github/workflows/psdocs-mdtogit.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ env:
2929
# github_pr_repo: ${{ github.event.pull_request.head.repo.full_name }}
3030

3131
permissions:
32+
actions: read
33+
checks: read
3234
contents: write
35+
deployments: read
36+
pull-requests: read
37+
statuses: read
3338

3439
jobs:
3540
arm_docs:
@@ -42,12 +47,12 @@ jobs:
4247
- name: Show env
4348
run: env | sort
4449

45-
# - name: Check out PR
46-
# run: |
47-
# echo "==> Check out PR..."
48-
# gh pr checkout "$github_pr_number"
49-
# env:
50-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
- name: Check out PR
51+
run: |
52+
echo "==> Check out PR..."
53+
gh pr checkout "$github_pr_number"
54+
env:
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5156
- name: Configure local git
5257
run: |
5358
echo "git user name : $github_user_name"
@@ -130,6 +135,6 @@ jobs:
130135
git commit --message "$github_commit_message [$GITHUB_ACTOR/${GITHUB_SHA::8}]"
131136
echo "==> Push changes..."
132137
echo "Pushing changes to: $main"
133-
git push "https://$GITHUB_TOKEN@github.com/Azure/avdaccelerator/tree/main"
138+
git push https://$GITHUB_TOKEN@github.com/Azure/avdaccelerator.git main
134139
env:
135140
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

readme.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,11 @@ The brownfield, add-ons and tools section, contains templates to deploy addition
7070

7171
### Custom image build
7272

73-
[Getting Started](/workload/docs/getting-started-custom-image-build.md) deploying a custom image based on the latest version of the Azure marketplace image to an Azure Compute Gallery. The following images are offered:
73+
[Getting Started](/workload/docs/getting-started-custom-image-build.md) deploying a custom image based on the latest version of the Azure marketplace image to an Azure Compute Gallery.
7474

75-
- Windows 10 22H2 (Gen 2)
76-
- Windows 11 22H2 (Gen 2)
77-
- Windows 11 23H2 (Gen 2)
78-
- Windows 11 24H2 (Gen 2)
79-
- Windows 10 22H2 with O365 (Gen 2)
80-
- Windows 11 22H2 with O365 (Gen 2)
81-
- Windows 11 23H2 with O365 (Gen 2)
82-
- Windows 11 24H2 with O365 (Gen 2)
75+
You can select to enable the Trusted Launch or Confidential VM security type feature on the Azure Compute Gallery image definition.
8376

84-
You can also select to enable the Trusted Launch or Confidential VM security type feature on the Azure Compute Gallery image definition.
85-
86-
Custom image is optimized using [Virtual Desktop Optimization Tool (VDOT)](https://github.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool) and patched with the latest Windows updates.
77+
Custom image is patched with the latest Windows updates.
8778

8879
| Deployment Type | Link |
8980
|:--|:--|

0 commit comments

Comments
 (0)