Skip to content

merge queue: embarking main (da68771), #1855 and #1856 together #1858

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.

Sign up for GitHub

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

Closed
mergify wants to merge 4 commits into from
+31 −31
Closed

merge queue: embarking main (da68771), #1855 and #1856 together #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d21b8da
Update dependency ty to >=0.0.36
renovate[bot] May 15, 2026
ec2f302
Update github/codeql-action action to v4.35.5
renovate[bot] May 15, 2026
c254617
Merge of #1855
mergify[bot] May 15, 2026
5b61fd5
Merge of #1856
mergify[bot] May 15, 2026
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
6 changes: 3 additions & 3 deletions .github/workflows/.docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
enable-url-completion: true
- name: Export tag for Testing and Scanning
id: tag
run: echo "TAG=$(echo "${{ steps.meta.outputs.tags }}" | tail -n 1)" >> $GITHUB_OUTPUT

Check failure on line 129 in .github/workflows/.docker.yaml

View workflow job for this annotation

GitHub Actions / Lint / ActionLint 

shellcheck reported issue in this script: SC2086:info:1:68: Double quote to prevent globbing and word splitting
docker_scout:
name: Docker Scout CVEs
needs: build_image
Expand Down Expand Up @@ -189,7 +189,7 @@
cache-db: true
- name: upload Anchore scan SARIF report
if: success() || failure()
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
with:
sarif_file: ${{ steps.scan.outputs.sarif }}
trivy:
Expand All @@ -212,7 +212,7 @@
scanners: vuln,secret,misconfig,license
- name: Upload Trivy scan results to GitHub Security tab
if: success() || failure()
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
with:
sarif_file: trivy-results-image.sarif
dockle:
Expand All @@ -233,7 +233,7 @@
ignore: CIS-DI-0006
- name: upload Dockle scan SARIF report
if: success() || failure()
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
with:
sarif_file: dockle.sarif
api_test:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/.lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
repo: trufflesecurity/trufflehog
cache: enable
- name: Git Secret Scanning
run: >-

Check failure on line 53 in .github/workflows/.lint.yaml

View workflow job for this annotation

GitHub Actions / Lint / ActionLint 

"github.head_ref" is potentially untrusted. avoid using it directly in inline scripts. instead, pass it through an environment variable. see https://docs.github.com/en/actions/reference/security/secure-use#good-practices-for-mitigating-script-injection-attacks for more details
trufflehog git ${{github.event.repository.html_url}} --branch=${{github.head_ref || github.ref_name}}
--fail --github-actions --results=verified,unknown --log-level=4 --no-update
pre-commit:
Expand Down Expand Up @@ -149,7 +149,7 @@
${{matrix.output == 'sarif' && '--output-file ruff.sarif' || ''}}
- name: upload Ruff scan SARIF report
if: matrix.output == 'sarif' && ( success() || failure() )
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
with:
sarif_file: ruff.sarif
- name: Commit and push applied Ruff fixes
Expand Down Expand Up @@ -226,7 +226,7 @@
cache-db: true
- name: upload Anchore scan SARIF report
if: success() || failure()
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
with:
sarif_file: ${{ steps.scan.outputs.sarif }}
trivy:
Expand Down Expand Up @@ -269,7 +269,7 @@
scanners: vuln,secret,misconfig
- name: Upload Trivy scan results to GitHub Security tab
if: matrix.scan-type != 'fs' && ( success() || failure() )
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
with:
sarif_file: ${{ matrix.output }}
category: ${{ matrix.scan-type }}
Expand Down Expand Up @@ -337,7 +337,7 @@
output-file: hadolint.sarif
- name: upload Hadolint scan SARIF report
if: success() || failure()
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
with:
sarif_file: hadolint.sarif
actionlint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily-malicious-code-scan.lock.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dev = [
"pytest-md>=0.2.0",
"pytest-mergify>=2026.4.7.1",
"ruff>=0.15.13",
"ty>=0.0.35",
"ty>=0.0.36",
"uv-build>=0.11.14",
]

Expand Down
44 changes: 22 additions & 22 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading