Skip to content

Commit

Permalink
Merge branch 'master' into feat/remove-client-secret
Browse files Browse the repository at this point in the history
  • Loading branch information
frederikprijck authored Nov 27, 2023
2 parents dcb3513 + 57b2d54 commit ada5bc8
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 4 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.x

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ jobs:
fetch-depth: 0
ref: ${{ github.event.inputs.branch }}

- name: Install Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.x

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios
Expand Down
71 changes: 71 additions & 0 deletions .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Snyk

on:
merge_group:
pull_request_target:
types:
- opened
- synchronize
push:
branches:
- master
schedule:
- cron: "30 0 1,15 * *"

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}

jobs:
authorize:
name: Authorize
environment: ${{ github.actor != 'dependabot[bot]' && github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository && 'external' || 'internal' }}
runs-on: ubuntu-latest
steps:
- run: true

check:
needs: authorize # Require approval before running on forked pull requests

name: Check for Vulnerabilities
runs-on: windows-2022

steps:
- if: github.actor == 'dependabot[bot]' || github.event_name == 'merge_group'
run: exit 0 # Skip unnecessary test runs for dependabot and merge queues. Artifically flag as successful, as this is a required check for branch protection.

- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.x

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios

- name: Setup NuGet
uses: nuget/setup-nuget@v1

- name: Restore NuGet
run: nuget restore Auth0.OidcClient.All.sln

# Install Snyk
- run: npm install snyk -g

# Check that project is registered with Snyk when triggered from master branch
- if: github.ref == 'refs/heads/master'
run: snyk monitor --file=Auth0.OidcClient.All.sln
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
continue-on-error: true

# Report vulnerabilities
- run: snyk test --file=Auth0.OidcClient.All.sln
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "6.0.417",
"rollForward": "latestFeature"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand Down

0 comments on commit ada5bc8

Please sign in to comment.