Skip to content

Commit a013278

Browse files
authored
Merge branch 'main' into bump-pluggy-160
2 parents a4d1eea + 4f03520 commit a013278

File tree

95 files changed

+10381
-1140
lines changed

Some content is hidden

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

95 files changed

+10381
-1140
lines changed

.github/workflows/contrib.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ name: Core Contrib Test
22

33
on:
44
push:
5-
branches-ignore:
6-
- 'release/*'
7-
- 'otelbot/*'
5+
branches:
6+
- 'main'
87
pull_request:
98

109
permissions:

.github/workflows/lint_0.yml

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Lint 0
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:
@@ -70,6 +69,44 @@ jobs:
7069
- name: Run tests
7170
run: tox -e lint-opentelemetry-proto-gen-latest
7271

72+
lint-opentelemetry-protojson-gen-latest:
73+
name: opentelemetry-protojson-gen-latest
74+
runs-on: ubuntu-latest
75+
timeout-minutes: 30
76+
steps:
77+
- name: Checkout repo @ SHA - ${{ github.sha }}
78+
uses: actions/checkout@v4
79+
80+
- name: Set up Python 3.14
81+
uses: actions/setup-python@v5
82+
with:
83+
python-version: "3.14"
84+
85+
- name: Install tox
86+
run: pip install tox-uv
87+
88+
- name: Run tests
89+
run: tox -e lint-opentelemetry-protojson-gen-latest
90+
91+
lint-opentelemetry-codegen-json:
92+
name: opentelemetry-codegen-json
93+
runs-on: ubuntu-latest
94+
timeout-minutes: 30
95+
steps:
96+
- name: Checkout repo @ SHA - ${{ github.sha }}
97+
uses: actions/checkout@v4
98+
99+
- name: Set up Python 3.14
100+
uses: actions/setup-python@v5
101+
with:
102+
python-version: "3.14"
103+
104+
- name: Install tox
105+
run: pip install tox-uv
106+
107+
- name: Run tests
108+
run: tox -e lint-opentelemetry-codegen-json
109+
73110
lint-opentelemetry-sdk:
74111
name: opentelemetry-sdk
75112
runs-on: ubuntu-latest

.github/workflows/misc_0.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Misc 0
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

.github/workflows/templates/lint.yml.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Lint {{ file_number }}
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

.github/workflows/templates/misc.yml.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Misc {{ file_number }}
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

.github/workflows/templates/test.yml.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Test {{ file_number }}
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

0 commit comments

Comments
 (0)