Skip to content

Commit 2be3564

Browse files
authored
Merge pull request #14 from ronaldbosma/small-patch
Add integration tests to PR trigger and use package reference update
2 parents 71ae788 + 68dacb0 commit 2be3564

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

.github/workflows/azure-dev.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- 'hooks/**'
1717
- 'infra/**'
1818
- 'src/**'
19+
- 'tests/AISQuick.IntegrationTests/**'
1920
- 'azure.yaml'
2021
- 'bicepconfig.json'
2122

@@ -31,6 +32,7 @@ env:
3132
# Add a unique suffix to the environment name for pull requests to avoid name conflicts
3233
AZURE_ENV_NAME: ${{ github.event.pull_request.number && format('{0}-pr{1}', vars.AZURE_ENV_NAME, github.event.pull_request.number) || vars.AZURE_ENV_NAME }}
3334
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
35+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID || vars.AZURE_SUBSCRIPTION_ID }}
3436

3537
# Individual resource inclusion flags
3638
INCLUDE_API_MANAGEMENT: ${{ vars.INCLUDE_API_MANAGEMENT }}
@@ -135,8 +137,6 @@ jobs:
135137
name: Deploy to Azure
136138
needs: build-verify-package
137139
runs-on: ubuntu-latest
138-
env:
139-
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID || vars.AZURE_SUBSCRIPTION_ID }}
140140
outputs:
141141
azure-resource-group: ${{ steps.get-outputs.outputs.azure-resource-group }}
142142
azure-api-management-name: ${{ steps.get-outputs.outputs.azure-api-management-name }}
@@ -277,8 +277,6 @@ jobs:
277277
(needs.integration-tests.result == 'skipped' && needs.deploy.result == 'success')
278278
)
279279
runs-on: ubuntu-latest
280-
env:
281-
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID || vars.AZURE_SUBSCRIPTION_ID }}
282280

283281
steps:
284282
- name: Checkout code

azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
name: azure-integration-services-quickstart
44
metadata:
5-
template: [email protected].0
5+
template: [email protected].1
66
hooks:
77
predown:
88
- shell: pwsh

tests/AISQuick.IntegrationTests/AISQuick.IntegrationTests.csproj

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,25 @@
1111
-->
1212
<TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
1313
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="18.0.0" />
17+
<PackageReference Update="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
18+
<PackageReference Update="Microsoft.Testing.Extensions.TrxReport" Version="2.0.1" />
19+
<PackageReference Update="MSTest.Analyzers" Version="4.0.1">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
23+
<PackageReference Update="MSTest.TestAdapter" Version="4.0.1" />
24+
<PackageReference Update="MSTest.TestFramework" Version="4.0.1" />
25+
</ItemGroup>
1426

1527
<ItemGroup>
1628
<PackageReference Include="Azure.Identity" Version="1.17.0" />
1729
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.8.0" />
1830
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
1931
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.10" />
2032
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.10" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
22-
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
23-
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.1" />
24-
<PackageReference Include="MSTest.Analyzers" Version="4.0.1">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
28-
<PackageReference Include="MSTest.TestAdapter" Version="4.0.1" />
29-
<PackageReference Include="MSTest.TestFramework" Version="4.0.1" />
3033
<PackageReference Include="Polly" Version="8.6.4" />
3134
</ItemGroup>
3235

0 commit comments

Comments
 (0)