Skip to content

Commit

Permalink
Merge pull request #5 from MJoshuaB/main
Browse files Browse the repository at this point in the history
Update working-main
  • Loading branch information
JessicaBell00 authored Sep 12, 2024
2 parents c81ff56 + 7dc03ca commit 18f09e9
Show file tree
Hide file tree
Showing 367 changed files with 456,699 additions and 9,863 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240708.1
--version 1.0.0-dev.20240909.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240708.1
--version 1.0.0-dev.20240909.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240708.1
--version 1.0.0-dev.20240909.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
57 changes: 57 additions & 0 deletions .github/workflows/tsp-client-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: tsp-client - Test

on:
push:
branches:
- main
pull_request:
paths:
- .github/workflows/tsp-client-tests.yml
- tools/tsp-client/**

jobs:
tsp-client:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [18, 20]
exclude:
- os: ubuntu-latest
node-version: 20
- os: windows-latest
node-version: 18

runs-on: ${{ matrix.os }}

steps:
- if: runner.os == 'Windows'
run: git config --global core.longpaths true
shell: pwsh

- uses: actions/checkout@v4
with:
sparse-checkout: |
.github/workflows
tools/tsp-client
- name: Use Node ${{ matrix.node-version }}.x
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}.x

- run: npm ci
shell: pwsh
working-directory: tools/tsp-client

- run: npm ls -a
shell: pwsh
continue-on-error: true
working-directory: tools/tsp-client

- run: npm run build
shell: pwsh
working-directory: tools/tsp-client

- run: npm run test
shell: pwsh
working-directory: tools/tsp-client
13 changes: 11 additions & 2 deletions eng/common/TestResources/SubConfig-Helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,26 @@ function UpdateSubscriptionConfigurationWithFiles([object]$baseSubConfig, [strin
# Helper function for processing stringified json sub configs from pipeline parameter data
function BuildAndSetSubscriptionConfig([string]$baseSubConfigJson, [string]$additionalSubConfigsJson, [string]$subConfigFilesJson) {
$finalConfig = @{}
if ($baseSubConfigJson) {

if ($baseSubConfigJson -and $baseSubConfigJson -ne '""') {
# When variable groups are not added to the pipeline, secret references like
# $(<my secret>) are passed as a string literal instead of being replaced by the keyvault secret value
if ($baseSubConfigJson -notlike '{*') {
throw "Expected a json dictionary object but found '$baseSubConfigJson'. This probably means a subscription config secret was not downloaded. The pipeline is likely missing a variable group."
}
$baseSubConfig = $baseSubConfigJson | ConvertFrom-Json -AsHashtable

Write-Host "Setting base sub config"
$finalConfig = SetSubscriptionConfiguration $baseSubConfig
}

if ($additionalSubConfigsJson) {
if ($additionalSubConfigsJson -and $additionalSubConfigsJson -ne '""') {
$subConfigs = $additionalSubConfigsJson | ConvertFrom-Json -AsHashtable

foreach ($subConfig in $subConfigs) {
if ($subConfig -isnot [hashtable]) {
throw "Expected a json dictionary object but found '$subConfig'. This probably means a subscription config secret was not downloaded. The pipeline is likely missing a variable group."
}
Write-Host "Merging sub config from list"
$finalConfig = UpdateSubscriptionConfiguration $finalConfig $subConfig
}
Expand Down
4 changes: 2 additions & 2 deletions eng/common/TestResources/deploy-test-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ steps:

- ${{ if eq('true', parameters.UseFederatedAuth) }}:
- task: AzurePowerShell@5
displayName: Deploy test resources
displayName: 🚀 Deploy test resources
env:
TEMP: $(Agent.TempDirectory)
PoolSubnet: $(PoolSubnet)
Expand Down Expand Up @@ -96,7 +96,7 @@ steps:
-ServicePrincipalAuth `
-Force `
-Verbose | Out-Null
displayName: Deploy test resources
displayName: 🚀 Deploy test resources
env:
TEMP: $(Agent.TempDirectory)
PoolSubnet: $(PoolSubnet)
Expand Down
Loading

0 comments on commit 18f09e9

Please sign in to comment.