Skip to content

Commit 1a6cfd7

Browse files
authored
Merge branch 'open-telemetry:main' into fix-restlet-1.1
2 parents 8bf6fc9 + 1b3aa9d commit 1a6cfd7

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
cache-read-only: ${{ github.event_name == 'pull_request' }}
5858

5959
- name: Initialize CodeQL
60-
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
60+
uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
6161
with:
6262
languages: ${{ matrix.language }}
6363
# using "latest" helps to keep up with the latest Kotlin support
@@ -73,6 +73,6 @@ jobs:
7373
run: ./gradlew assemble -x javadoc -x :instrumentation:quarkus-resteasy-reactive:quarkus3-testing:quarkusGenerateCodeDev -x :instrumentation:quarkus-resteasy-reactive:quarkus2-testing:quarkusGenerateCodeDev --no-build-cache --no-daemon
7474

7575
- name: Perform CodeQL analysis
76-
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
76+
uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
7777
with:
7878
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
45+
uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
4646
with:
4747
sarif_file: results.sarif

.github/workflows/reusable-misspell-check.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ jobs:
1414

1515
- name: Install misspell
1616
run: |
17-
curl -L -o install-misspell.sh \
18-
https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh
19-
sh ./install-misspell.sh
17+
curl -sfL https://raw.githubusercontent.com/golangci/misspell/master/install-misspell.sh | sh -s -- -b bin
2018
2119
- name: Run misspell
2220
run: |

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ codenarc {
431431
checkstyle {
432432
configFile = rootProject.file("buildscripts/checkstyle.xml")
433433
// this version should match the version of google_checks.xml used as basis for above configuration
434-
toolVersion = "10.26.0"
434+
toolVersion = "10.26.1"
435435
maxWarnings = 0
436436
}
437437

0 commit comments

Comments
 (0)