Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/microsoft/msquic
Browse files Browse the repository at this point in the history
  • Loading branch information
nibanks committed Jul 25, 2024
2 parents 0efe8ad + 6351c6e commit bbcc2a3
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .azure/OneBranch.Official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
- name: 'WindowsContainerImage2DockerTag'
displayName: 'WindowsContainerImage2 DockerTag'
type: string
default: '20240309.1' # if initializing docker takes too long, grab a newer docker image from Docker.Official pipeline.
default: '20240713.1' # if initializing docker takes too long, grab a newer docker image from Docker.Official pipeline.

variables:
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: Cargo
steps:
- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c
with:
egress-policy: audit
- name: Checkout repository
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c
with:
egress-policy: audit
- name: Checkout repository
Expand All @@ -51,7 +51,7 @@ jobs:
cmake --build . --target OpenSSL_Target
- name: Initialize CodeQL
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f
uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac
with:
languages: cpp
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -62,4 +62,4 @@ jobs:
cmake --build .
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f
uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish-xcomp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c
with:
egress-policy: audit

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c
uses: docker/build-push-action@1ca370b3a9802c92e886402e0dd88098a2533b12
with:
context: .docker/ubuntu-${{ matrix.version }}
file: .docker/ubuntu-${{ matrix.version }}/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c
with:
egress-policy: audit
- name: Checkout repository
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c
uses: docker/build-push-action@1ca370b3a9802c92e886402e0dd88098a2533b12
with:
context: .
file: scripts/qns.Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion submodules/googletest

0 comments on commit bbcc2a3

Please sign in to comment.