Skip to content

Commit 3bf0c7b

Browse files
authored
Merge branch 'main' into goversion
2 parents d9427de + 4e8e1d6 commit 3bf0c7b

38 files changed

+279
-280
lines changed

.github/workflows/check-links.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Link Checker
4747
id: lychee
48-
uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6
48+
uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c
4949
with:
5050
args: "--verbose --no-progress ${{needs.changedfiles.outputs.files}} --config .github/lychee.toml"
5151
failIfEmpty: false

.github/workflows/ci-collector.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@ on:
1414
branches:
1515
- main
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
test:
1922
runs-on: ubuntu-latest
2023
steps:
21-
- uses: actions/checkout@v4
22-
- uses: actions/setup-go@v5
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2326
with:
2427
go-version: '~1.21.9'
25-
- uses: actions/cache@v4
28+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2629
with:
2730
path: ~/go/pkg/mod
2831
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -41,11 +44,11 @@ jobs:
4144
matrix:
4245
architecture: [ amd64, arm64 ]
4346
steps:
44-
- uses: actions/checkout@v4
45-
- uses: actions/setup-go@v5
47+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
48+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4649
with:
4750
go-version: '~1.21.9'
48-
- uses: actions/cache@v4
51+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4952
with:
5053
path: ~/go/pkg/mod
5154
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

.github/workflows/ci-java.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
build:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525

26-
- uses: actions/setup-java@v4
26+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2727
with:
2828
distribution: corretto
2929
java-version: 17
3030

3131
- name: Setup Gradle
32-
uses: gradle/actions/setup-gradle@v4
32+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
3333
with:
3434
add-job-summary-as-pr-comment: on-failure # Valid values are 'never' (default), 'always', and 'on-failure'
3535

.github/workflows/ci-nodejs.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@ on:
1414
branches:
1515
- main
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
build:
1922
runs-on: ubuntu-latest
2023
steps:
21-
- uses: actions/checkout@v4
22-
- uses: actions/setup-node@v4
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2326
with:
2427
node-version: 18
25-
- uses: actions/cache@v4
28+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2629
with:
2730
path: ~/.npm
2831
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/ci-python.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ env:
2020
# https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/.github/workflows/test.yml#L9
2121
CORE_REPO_SHA: v1.19.0
2222

23+
permissions:
24+
contents: read
25+
2326
jobs:
2427
build:
2528
runs-on: ubuntu-latest
@@ -32,9 +35,9 @@ jobs:
3235

3336
steps:
3437
- name: Checkout this repo
35-
uses: actions/checkout@v4
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3639
- name: Setup Python for OTel Python SDK
37-
uses: actions/setup-python@v5
40+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3841
with:
3942
python-version: ${{ matrix.python }}
4043
- name: Install tox testing package
@@ -43,7 +46,7 @@ jobs:
4346
pip install tox
4447
tox
4548
- name: Set up Go for ADOT Collector
46-
uses: actions/setup-go@v5
49+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4750
with:
4851
go-version: '^1.20.8'
4952
- name: Build Python Layer which includes ADOT Collector

.github/workflows/ci-shellcheck.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ name: "Continuous Build (shellcheck)"
22

33
on: [push, pull_request]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
shellcheck:
710
runs-on: ubuntu-latest
811
steps:
9-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1013

1114
- name: Install shell check
1215
run: sudo apt update && sudo apt install --assume-yes shellcheck

.github/workflows/ci-terraform.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ on:
1414
branches:
1515
- main
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
check-terraform-syntax:
1922
runs-on: ubuntu-latest
2023
steps:
21-
- uses: actions/checkout@v4
22-
- uses: hashicorp/setup-terraform@v3
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
2326
- run: terraform fmt -check -recursive

.github/workflows/close-stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
stale:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/stale@v9
14+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
1515
with:
1616
repo-token: ${{ secrets.GITHUB_TOKEN }}
1717
stale-issue-message: 'This issue was marked stale. It will be closed in 30 days without additional activity.'

.github/workflows/codeql.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ on:
2020
schedule:
2121
- cron: '37 10 * * 2'
2222

23+
permissions:
24+
contents: read
25+
2326
jobs:
2427
analyze:
2528
name: Analyze
@@ -61,11 +64,11 @@ jobs:
6164

6265
steps:
6366
- name: Checkout repository
64-
uses: actions/checkout@v4
67+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6568

6669
# Initializes the CodeQL tools for scanning.
6770
- name: Initialize CodeQL
68-
uses: github/codeql-action/init@v3
71+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
6972
with:
7073
languages: ${{ matrix.target.language }}
7174
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -79,7 +82,7 @@ jobs:
7982
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
8083
# If this step fails, then you should remove it and run the build manually (see below)
8184
- name: Autobuild
82-
uses: github/codeql-action/autobuild@v3
85+
uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
8386
with:
8487
working-directory: ${{ matrix.target.directory }}
8588
# There are no array literals in GHA that is why we need to use fromJson.
@@ -96,22 +99,22 @@ jobs:
9699
# ./location_of_script_within_repo/buildscript.sh
97100

98101
- name: Set up Java
99-
uses: actions/setup-java@v4
102+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
100103
with:
101104
distribution: corretto
102105
java-version: '11'
103106
if: ${{ matrix.target.language == 'java' }}
104107

105108
- name: Setup Gradle
106-
uses: gradle/actions/setup-gradle@v4
109+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
107110

108111
- name: build Java
109112
run: ./gradlew build --no-build-cache
110113
working-directory: ${{ matrix.target.directory }}
111114
if: ${{ matrix.target.language == 'java' }}
112115

113116
- name: setup dotnet
114-
uses: actions/setup-dotnet@v4
117+
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
115118
with:
116119
dotnet-version: 6.x
117120
if: ${{ matrix.target.language == 'csharp' }}
@@ -123,6 +126,6 @@ jobs:
123126
if: ${{ matrix.target.language == 'csharp' }}
124127

125128
- name: Perform CodeQL Analysis
126-
uses: github/codeql-action/analyze@v3
129+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
127130
with:
128131
category: "/language:${{matrix.target.language}}"

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

17-
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
17+
- uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

0 commit comments

Comments
 (0)