Skip to content

Commit 82be62c

Browse files
yurishkuroyurishkuro
authored
Merge branch 'main' into zpagesextension-add-expvar
2 parents 8c1fe89 + ffcef93 commit 82be62c

File tree

122 files changed

+360
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+360
-357
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
- name: Run Unit Tests With Coverage
219219
run: make gotest-with-cover
220220
- name: Upload coverage report
221-
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # 5.1.1
221+
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # 5.1.2
222222
env:
223223
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
224224

‎.github/workflows/changelog.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ concurrency:
1818

1919
permissions: read-all
2020

21+
env:
22+
# renovate: datasource=github-releases depName=tcort/markdown-link-check
23+
MD_LINK_CHECK_VERSION: "3.12.2"
24+
2125
jobs:
2226
changelog:
2327
runs-on: ubuntu-latest
@@ -78,7 +82,7 @@ jobs:
7882
- name: Render .chloggen changelog entries
7983
run: make chlog-preview > changelog_preview.md
8084
- name: Install markdown-link-check
81-
run: npm ci
85+
run: npm install -g markdown-link-check@${{ env.MD_LINK_CHECK_VERSION }}
8286
- name: Run markdown-link-check
8387
run: |
8488
npx --no -- markdown-link-check \

‎.github/workflows/check-links.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ concurrency:
1212

1313
permissions: read-all
1414

15+
env:
16+
# renovate: datasource=github-releases depName=tcort/markdown-link-check
17+
MD_LINK_CHECK_VERSION: "3.12.2"
18+
1519
jobs:
1620
changedfiles:
1721
name: changed files
@@ -46,7 +50,7 @@ jobs:
4650
fetch-depth: 0
4751

4852
- name: Install markdown-link-check
49-
run: npm ci
53+
run: npm install -g markdown-link-check@${{ env.MD_LINK_CHECK_VERSION }}
5054

5155
- name: Run markdown-link-check
5256
run: |

‎.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
32+
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
3333
with:
3434
languages: go
3535

3636
- name: Autobuild
37-
uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
37+
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
3838

3939
- name: Perform CodeQL Analysis
40-
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
40+
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0

‎.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464

6565
# Upload the results to GitHub's code scanning dashboard.
6666
- name: "Upload to code-scanning"
67-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
67+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
6868
with:
6969
sarif_file: results.sarif

‎client/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ require (
2121
golang.org/x/sys v0.28.0 // indirect
2222
golang.org/x/text v0.21.0 // indirect
2323
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
24-
google.golang.org/grpc v1.69.0 // indirect
25-
google.golang.org/protobuf v1.36.0 // indirect
24+
google.golang.org/grpc v1.69.2 // indirect
25+
google.golang.org/protobuf v1.36.1 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)
2828

‎client/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/mdatagen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ require (
6060
golang.org/x/net v0.33.0 // indirect
6161
golang.org/x/sys v0.28.0 // indirect
6262
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
63-
google.golang.org/grpc v1.69.0 // indirect
64-
google.golang.org/protobuf v1.36.0 // indirect
63+
google.golang.org/grpc v1.69.2 // indirect
64+
google.golang.org/protobuf v1.36.1 // indirect
6565
gopkg.in/yaml.v3 v3.0.1 // indirect
6666
)
6767

‎cmd/mdatagen/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcorecol/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ require (
153153
gonum.org/v1/gonum v0.15.1 // indirect
154154
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
155155
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
156-
google.golang.org/grpc v1.69.0 // indirect
157-
google.golang.org/protobuf v1.36.0 // indirect
156+
google.golang.org/grpc v1.69.2 // indirect
157+
google.golang.org/protobuf v1.36.1 // indirect
158158
gopkg.in/yaml.v3 v3.0.1 // indirect
159159
)
160160

0 commit comments

Comments
 (0)