From 165d6877fd0d65adf27b75d8e3139f5558760570 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 26 Dec 2023 21:26:03 -0500 Subject: [PATCH 1/2] Update Workflows (#385) * Consistently use azure/powershell@v1 * Consistently use actions/checkout@v4 * Consistently use actions/setup-node@v4 * Consistently use actions/github-script@v7 * Consistently use actions/stale@v8 * Specify codql language as javascript See https://api.github.com/repos/github/codeql-action/issues/comments/762138640 * Name ci.yml * CodeQL does not need a special code --- .github/workflows/azure-login-canary.yml | 2 +- .github/workflows/azure-login-negative.yml | 62 +++++++++++----------- .github/workflows/azure-login-positive.yml | 34 ++++++------ .github/workflows/azure-login-pr-check.yml | 4 +- .github/workflows/ci.yml | 6 ++- .github/workflows/codeql.yml | 18 ++----- .github/workflows/defaultLabels.yml | 4 +- .github/workflows/markdownlint.yml | 4 +- README.md | 12 ++--- 9 files changed, 69 insertions(+), 77 deletions(-) diff --git a/.github/workflows/azure-login-canary.yml b/.github/workflows/azure-login-canary.yml index 75235a30a..5c430f703 100644 --- a/.github/workflows/azure-login-canary.yml +++ b/.github/workflows/azure-login-canary.yml @@ -30,7 +30,7 @@ jobs: az --version - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Az CLI login with subscription' uses: azure/login@v1 diff --git a/.github/workflows/azure-login-negative.yml b/.github/workflows/azure-login-negative.yml index 4f0362620..e312b025a 100644 --- a/.github/workflows/azure-login-negative.yml +++ b/.github/workflows/azure-login-negative.yml @@ -15,10 +15,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x @@ -44,7 +44,7 @@ jobs: - name: Run Azure PowerShell id: ps_1 continue-on-error: true - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -54,7 +54,7 @@ jobs: - name: Check Last step failed if: steps.ps_1.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -76,7 +76,7 @@ jobs: - name: Run Azure PowerShell again id: ps_2 continue-on-error: true - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -84,7 +84,7 @@ jobs: - name: Check Last step failed if: steps.ps_2.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -99,10 +99,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x @@ -130,7 +130,7 @@ jobs: - name: Check Last step failed if: steps.cli_3.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -138,7 +138,7 @@ jobs: - name: Run Azure PowerShell id: ps_3 continue-on-error: true - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -148,7 +148,7 @@ jobs: - name: Check Last step failed if: steps.ps_3.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -162,10 +162,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x @@ -184,7 +184,7 @@ jobs: - name: Check Last step failed if: steps.login_4.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -199,7 +199,7 @@ jobs: - name: Check Last step failed if: steps.login_5.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -213,7 +213,7 @@ jobs: - name: Check Last step failed if: steps.login_6.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -229,7 +229,7 @@ jobs: - name: Check Last step failed if: steps.login_7.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -246,7 +246,7 @@ jobs: - name: Check Last step failed if: steps.login_8.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -266,7 +266,7 @@ jobs: - name: Run Azure PowerShell id: ps_8 continue-on-error: true - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -276,7 +276,7 @@ jobs: - name: Check Last step failed if: steps.ps_8.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -296,7 +296,7 @@ jobs: - name: Run Azure PowerShell id: ps_9 continue-on-error: true - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -306,7 +306,7 @@ jobs: - name: Check Last step failed if: steps.ps_9.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -325,7 +325,7 @@ jobs: - name: Check Last step failed if: steps.login_10.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -342,7 +342,7 @@ jobs: - name: Check Last step failed if: steps.login_11.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -362,7 +362,7 @@ jobs: - name: Check Last step failed if: steps.login_12.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -378,7 +378,7 @@ jobs: - name: Check Last step failed if: steps.login_13.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -394,7 +394,7 @@ jobs: - name: Check Last step failed if: steps.login_14.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -409,7 +409,7 @@ jobs: - name: Check Last step failed if: steps.login_15.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') @@ -423,10 +423,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x @@ -442,7 +442,7 @@ jobs: - name: Check Last step failed if: steps.login_14.outcome == 'success' - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Last action should fail but not. Please check it.') diff --git a/.github/workflows/azure-login-positive.yml b/.github/workflows/azure-login-positive.yml index fdcca1517..d69e63e74 100644 --- a/.github/workflows/azure-login-positive.yml +++ b/.github/workflows/azure-login-positive.yml @@ -18,10 +18,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x @@ -47,7 +47,7 @@ jobs: az vm list --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -71,7 +71,7 @@ jobs: az account show --output none - name: Run Azure PowerShell again - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -94,7 +94,7 @@ jobs: az vm list --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -114,10 +114,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x @@ -164,7 +164,7 @@ jobs: az vm list --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -189,7 +189,7 @@ jobs: az account show --output none - name: Run Azure PowerShell again - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -211,7 +211,7 @@ jobs: az account show --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -232,7 +232,7 @@ jobs: az account show --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -250,10 +250,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x @@ -274,7 +274,7 @@ jobs: az account show --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -297,7 +297,7 @@ jobs: az vm list --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -321,7 +321,7 @@ jobs: az account show --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -345,7 +345,7 @@ jobs: az vm list --output none - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | diff --git a/.github/workflows/azure-login-pr-check.yml b/.github/workflows/azure-login-pr-check.yml index 040915397..51836e59f 100644 --- a/.github/workflows/azure-login-pr-check.yml +++ b/.github/workflows/azure-login-pr-check.yml @@ -11,14 +11,14 @@ jobs: runs-on: windows-latest steps: - name: Checkout from PR branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} # Using 16.x version as an example - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94f3bce2d..8c21369bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,3 +1,5 @@ +name: Build and Test + on: pull_request: branches: @@ -16,10 +18,10 @@ jobs: steps: - name: 'Checking out repo code' - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 16.x diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 63fc0fca0..fb2b55d4d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,23 +14,13 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 - with: - # We must fetch at least the immediate parents so that if this is - # a pull request then we can checkout the head. - fetch-depth: 2 - - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - + uses: actions/checkout@v4 + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 - # Override language selection by uncommenting this and choosing your languages - # with: - # languages: go, javascript, csharp, python, cpp, java + with: + languages: javascript # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) diff --git a/.github/workflows/defaultLabels.yml b/.github/workflows/defaultLabels.yml index 4ea16e376..b9c165487 100644 --- a/.github/workflows/defaultLabels.yml +++ b/.github/workflows/defaultLabels.yml @@ -14,7 +14,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: actions/stale@v3 + - uses: actions/stale@v8 name: Setting issue as idle with: repo-token: ${{ secrets.GITHUB_TOKEN }} @@ -25,7 +25,7 @@ jobs: operations-per-run: 100 exempt-issue-labels: 'backlog' - - uses: actions/stale@v3 + - uses: actions/stale@v8 name: Setting PR as idle with: repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml index ecea740c3..fe5d1b59b 100644 --- a/.github/workflows/markdownlint.yml +++ b/.github/workflows/markdownlint.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 16.x - name: Run Markdownlint diff --git a/README.md b/README.md index 9a52db323..8c4ea0549 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,7 @@ jobs: az account show - name: Azure PowerShell script - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -323,7 +323,7 @@ jobs: az account show - name: Azure PowerShell script - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -394,7 +394,7 @@ jobs: az account show - name: Azure PowerShell script - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -461,7 +461,7 @@ jobs: az account show - name: Azure PowerShell script - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -549,7 +549,7 @@ jobs: az account show - name: Run Azure PowerShell - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | @@ -570,7 +570,7 @@ This action doesn't implement ```az logout``` by default at the end of execution az account clear - name: Azure PowerShell script - uses: azure/powershell@v1.2.0 + uses: azure/powershell@v1 with: azPSVersion: "latest" inlineScript: | From 45c3280904d6ab9d2fba45123b9e0aeb15ea9cd0 Mon Sep 17 00:00:00 2001 From: Yan Xu Date: Wed, 27 Dec 2023 14:30:51 +0800 Subject: [PATCH 2/2] update workflow files for macos (#390) --- .github/workflows/azure-login-negative.yml | 80 ---------------------- .github/workflows/azure-login-positive.yml | 4 +- 2 files changed, 2 insertions(+), 82 deletions(-) diff --git a/.github/workflows/azure-login-negative.yml b/.github/workflows/azure-login-negative.yml index e312b025a..3e6dd0c93 100644 --- a/.github/workflows/azure-login-negative.yml +++ b/.github/workflows/azure-login-negative.yml @@ -9,86 +9,6 @@ permissions: jobs: - OSTest: - runs-on: macos-latest - environment: Automation test - - steps: - - name: 'Checking out repo code' - uses: actions/checkout@v4 - - - name: Set Node.js 16.x for GitHub Action - uses: actions/setup-node@v4 - with: - node-version: 16.x - - - name: 'Validate build' - run: | - npm install - npm run build - npm run test - - - name: Login with creds - continue-on-error: true - uses: ./ - with: - creds: ${{secrets.SP1}} - enable-AzPSSession: true - - - name: Run Azure Cli - run: | - az account show --output none - az group show --name GitHubAction_CI_RG --output none - az vm list --output none - - - name: Run Azure PowerShell - id: ps_1 - continue-on-error: true - uses: azure/powershell@v1 - with: - azPSVersion: "latest" - inlineScript: | - (Get-AzContext).Environment.Name -eq 'AzureCloud' - (Get-AzResourceGroup -Name GitHubAction_CI_RG).ResourceGroupName -eq 'GitHubAction_CI_RG' - (Get-AzVM).Count -gt 0 - - - name: Check Last step failed - if: steps.ps_1.outcome == 'success' - uses: actions/github-script@v7 - with: - script: | - core.setFailed('Last action should fail but not. Please check it.') - - - name: Login with individual parameters - id: login_2 - uses: ./ - with: - client-id: ${{ secrets.OIDC_SP2_CLIENT_ID }} - tenant-id: ${{ secrets.OIDC_SP2_TENANT_ID }} - # subscription-id: ${{ secrets.OIDC_SP2_SUBSCRIPTION_ID }} - allow-no-subscriptions: true - enable-AzPSSession: true - - - name: Run Azure Cli again - run: | - az account show --output none - - - name: Run Azure PowerShell again - id: ps_2 - continue-on-error: true - uses: azure/powershell@v1 - with: - azPSVersion: "latest" - inlineScript: | - (Get-AzContext).Environment.Name -eq 'AzureCloud' - - - name: Check Last step failed - if: steps.ps_2.outcome == 'success' - uses: actions/github-script@v7 - with: - script: | - core.setFailed('Last action should fail but not. Please check it.') - PermissionTest: strategy: matrix: diff --git a/.github/workflows/azure-login-positive.yml b/.github/workflows/azure-login-positive.yml index d69e63e74..a7e960014 100644 --- a/.github/workflows/azure-login-positive.yml +++ b/.github/workflows/azure-login-positive.yml @@ -12,7 +12,7 @@ jobs: BasicTest: strategy: matrix: - os: [ubuntu-latest, windows-latest, self_linux, self_windows] + os: [ubuntu-latest, windows-latest, macos-latest, self_linux, self_windows] runs-on: ${{ matrix.os }} environment: Automation test @@ -108,7 +108,7 @@ jobs: ParameterTest: strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.os }} environment: Automation test