Skip to content

Commit

Permalink
Merge branch 'main' into vwanbugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Springstone authored Aug 28, 2024
2 parents 744d103 + 7f977fa commit 3d36646
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 19 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2

updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
2 changes: 1 addition & 1 deletion .github/workflows/code-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-ado-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -59,7 +59,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: SARIF file
path: results.sarif
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test-portal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -75,7 +75,7 @@ jobs:
run: env | sort

- name: List available pwsh modules
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: Get-Module -ListAvailable
azPSVersion: "latest"
Expand All @@ -89,7 +89,7 @@ jobs:
enable-AzPSSession: true

- name: Register subscriptions
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: |
./src/scripts/Invoke-ActionRegisterSubscriptions.ps1
Expand All @@ -99,14 +99,14 @@ jobs:
BILLING_SCOPE: ${{ secrets.BILLING_SCOPE }}

- name: Pre-process subscriptions
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: ./src/scripts/Invoke-ActionRemoveOrphanedRBAC.ps1
azPSVersion: "latest"

- name: Generate eslzArm configuration
id: config
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: |
./src/scripts/Invoke-ActionGenerateEslzArmConfig.ps1
Expand All @@ -116,19 +116,19 @@ jobs:
DEPLOYMENT_LOCATION: ${{ secrets.DEPLOYMENT_LOCATION }}

- name: Run eslzArm deployment (TEST)
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: ./src/scripts/Invoke-ActionRunEslzArmDeployment.ps1 -Test
azPSVersion: "latest"

- name: Run eslzArm deployment (WHAT IF)
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: ./src/scripts/Invoke-ActionRunEslzArmDeployment.ps1 -WhatIf
azPSVersion: "latest"

- name: Run eslzArm deployment (DEPLOY)
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: ./src/scripts/Invoke-ActionRunEslzArmDeployment.ps1
azPSVersion: "latest"
Expand All @@ -140,7 +140,7 @@ jobs:
Update-AzConfig -DisplayBreakingChangeWarning $false
- name: Pester Test for Policies
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: ./.github/actions-pester/PTF-TestPolicies.ps1
azPSVersion: "latest"
Expand All @@ -150,7 +150,7 @@ jobs:
TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}

- name: Run eslzArm deployment (DESTROY)
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: ./src/scripts/Invoke-ActionRunEslzArmDeployment.ps1 -Destroy
azPSVersion: "9.4.0"
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-policies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{github.event.pull_request.head.ref}}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-alz-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -47,7 +47,7 @@ jobs:
git config --global user.email "$github_email"
- name: Azure login
uses: azure/login@v1
uses: azure/login@v2
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
Expand All @@ -71,7 +71,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.github_token }}

- name: Update ProviderApiVersions
uses: azure/powershell@v1
uses: azure/powershell@v2
with:
inlineScript: src/Alz.Tools/scripts/Update-ProviderApiVersionsZip.ps1
azPSVersion: "latest"
Expand Down

0 comments on commit 3d36646

Please sign in to comment.