Skip to content

Commit

Permalink
Updated scripts and testing code scanning for actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Tintintani committed Feb 13, 2025
1 parent 43debba commit d989c7f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python', 'ruby' ]
language: [ 'javascript', 'python', 'ruby', 'actions']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/solutionIntegration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
paths:
- 'Solutions/**/Package/mainTemplate.json'

workflow_dispatch: # Allows to run workflow manually from the Actions tab
permissions:
id-token: write
contents: read
Expand All @@ -34,7 +33,7 @@ jobs:
git config --local user.email "<>"
- name: Azure Login to Dev Account
uses: azure/login@v2
uses: azure/login@a65d910e8af852a8061c627c456678983e180302
with:
client-id: ${{ secrets.AZURE_SOLUTIONTESTING_DEV_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_SOLUTIONTESTING_DEV_TENANT_ID }}
Expand All @@ -50,6 +49,7 @@ jobs:
if [ -f "./evaluateAndExtractTemplate.py" ]; then rm ./evaluateAndExtractTemplate.py; fi
if [ -f "./runUITests.py" ]; then rm ./runUITests.py; fi
if [ -f "./requirements.txt" ]; then rm ./requirements.txt; fi
if [ -f "./config.json" ]; then rm ./config.json; fi
- name: Download files from ADO #TODO: update repo link to main
run: |
Expand All @@ -60,6 +60,8 @@ jobs:
"https://dev.azure.com/msazure/One/_apis/git/repositories/Sentinel-CATUtilities/items?path=/SolutionIntegrationTesting/.scripts/runUITests.py&versionDescriptor.versionType=Branch&versionDescriptor.version=users/tanishqarora/solutionIntegrationTesting&api-version=6.0" \
-o requirements.txt \
"https://dev.azure.com/msazure/One/_apis/git/repositories/Sentinel-CATUtilities/items?path=/SolutionIntegrationTesting/requirements.txt&versionDescriptor.versionType=Branch&versionDescriptor.version=users/tanishqarora/solutionIntegrationTesting&api-version=6.0"
-o config.json \
"https://dev.azure.com/msazure/One/_apis/git/repositories/Sentinel-CATUtilities/items?path=/SolutionIntegrationTesting/config.json&versionDescriptor.versionType=Branch&versionDescriptor.version=users/tanishqarora/solutionIntegrationTesting&api-version=6.0"
- name: Setup Python Environment
uses: actions/setup-python@v2
Expand All @@ -77,7 +79,7 @@ jobs:
echo "AZURE_TEST_TENANT_ID=$(az keyvault secret show --name TenantId-Test --vault-name e2e-solIntegTesting-KV --query value -o tsv)" >> $GITHUB_ENV
- name: Azure Login to Test Tenant Account
uses: azure/login@v2
uses: azure/login@a65d910e8af852a8061c627c456678983e180302
with:
client-id: ${{ env.AZURE_TEST_CLIENT_ID }}
tenant-id: ${{ env.AZURE_TEST_TENANT_ID }}
Expand All @@ -94,7 +96,7 @@ jobs:
python $filePath
- name: Azure Login to Dev Account
uses: azure/login@v2
uses: azure/login@a65d910e8af852a8061c627c456678983e180302
if: '!cancelled()'
with:
client-id: ${{ secrets.AZURE_SOLUTIONTESTING_DEV_CLIENT_ID }}
Expand Down

0 comments on commit d989c7f

Please sign in to comment.