Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick build and test changes #4703

Merged
merged 17 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions .github/workflows/benchmark-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,36 @@ on:
- src/client/Microsoft.Identity.Client/**/*.cs

permissions:
# Deployments permission to deploy GitHub pages website
deployments: write
# Contents permission to update benchmark contents in gh-pages branch
contents: write
contents: read

jobs:
benchmark:
permissions:
contents: write # Elevate permissions specifically for this job
name: Run performance benchmarks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
with:
egress-policy: audit

- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
with:
dotnet-version: '3.1.426'
- name: Run benchmark
run: cd tests/Microsoft.Identity.Test.Performance && dotnet run -c release -f netcoreapp3.1 --exporters json

- name: Download previous benchmark data
uses: actions/cache@v3
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
with:
path: ./cache
key: ${{ runner.os }}-benchmark

- name: Store AcquireTokenNoCacheTests result
uses: benchmark-action/github-action-benchmark@v1
uses: benchmark-action/github-action-benchmark@cc9ac13ce81036c9b67fcfe2cb95ca366684b9ea # v1.19.3
with:
name: AcquireTokenNoCache
tool: 'benchmarkdotnet'
Expand All @@ -48,7 +53,7 @@ jobs:
benchmark-data-dir-path: benchmarks

- name: Store AcquireTokenForClientCacheTests result
uses: benchmark-action/github-action-benchmark@v1
uses: benchmark-action/github-action-benchmark@cc9ac13ce81036c9b67fcfe2cb95ca366684b9ea # v1.19.3
with:
name: AcquireTokenForClientWithCache
tool: 'benchmarkdotnet'
Expand All @@ -64,7 +69,7 @@ jobs:
benchmark-data-dir-path: benchmarks

- name: Store AcquireTokenForOboCacheTests result
uses: benchmark-action/github-action-benchmark@v1
uses: benchmark-action/github-action-benchmark@cc9ac13ce81036c9b67fcfe2cb95ca366684b9ea # v1.19.3
with:
name: AcquireTokenForOboWithCache
tool: 'benchmarkdotnet'
Expand All @@ -80,7 +85,7 @@ jobs:
benchmark-data-dir-path: benchmarks

- name: Store TokenCacheTests result
uses: benchmark-action/github-action-benchmark@v1
uses: benchmark-action/github-action-benchmark@cc9ac13ce81036c9b67fcfe2cb95ca366684b9ea # v1.19.3
with:
name: TokenCacheTestsWithCache
tool: 'benchmarkdotnet'
Expand Down
72 changes: 0 additions & 72 deletions .github/workflows/scorecard.yml

This file was deleted.

10 changes: 9 additions & 1 deletion .github/workflows/trigger_onebranch_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,21 @@ on:
branches:
- main

permissions:
contents: read

jobs:
build:
name: Call OneBranch ADO Pipeline (CI)
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
with:
egress-policy: audit

- name: Azure Pipelines Action
uses: Azure/pipelines@v1
uses: Azure/pipelines@354dddefceb0b503a61338ca81e4091eae3bc84f # v1
with:
azure-devops-project-url: https://identitydivision.visualstudio.com/IDDP
azure-pipeline-name: 'MSAL.NET-OneBranch-Release-Official'
Expand Down
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.22.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.SignedHttpRequest" Version="6.22.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
Expand All @@ -64,8 +64,8 @@
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.6.0" />
<PackageVersion Include="Polly" Version="7.2.3" />
<PackageVersion Include="Selenium.Support" Version="4.4.0" />
<PackageVersion Include="Selenium.WebDriver" Version="4.4.0" />
<PackageVersion Include="Selenium.Support" Version="4.19.0" />
<PackageVersion Include="Selenium.WebDriver" Version="4.19.0" />
<PackageVersion Include="StrongNamer" Version="0.2.5" />
<PackageVersion Include="System.CodeDom" Version="6.0.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.22.0" />
Expand Down
Loading