Skip to content

Commit ead2776

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 2024/add/tokenTyping
2 parents 8c6b4c6 + 415c94f commit ead2776

File tree

352 files changed

+10580
-6852
lines changed

Some content is hidden

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

352 files changed

+10580
-6852
lines changed

.flake8

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/rtd-build-instructions.png

527 KB
Loading
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash -e
2+
3+
sed -i "/\[stable\]/{n;s/version=.*/version=$1/}" eachdist.ini
4+
sed -i "/\[prerelease\]/{n;s/version=.*/version=$2/}" eachdist.ini
5+
6+
./scripts/eachdist.py update_patch_versions \
7+
--stable_version=$1 \
8+
--unstable_version=$2 \
9+
--stable_version_prev=$3 \
10+
--unstable_version_prev=$4
11+

.github/workflows/check-links.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ jobs:
2323
check-links:
2424
runs-on: ubuntu-latest
2525
needs: changedfiles
26-
if: ${{needs.changedfiles.outputs.md}}
26+
if: |
27+
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
28+
&& ${{needs.changedfiles.outputs.md}}
2729
steps:
2830
- name: Checkout Repo
2931
uses: actions/checkout@v4
3032
with:
3133
fetch-depth: 0
3234

3335
- name: Install markdown-link-check
34-
run: npm install -g markdown-link-check
36+
run: npm install -g markdown-link-check@v3.12.2
3537

3638
- name: Run markdown-link-check
3739
run: |

.github/workflows/contrib.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Core Contrib Test
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- 'release/*'
7+
pull_request:
8+
9+
jobs:
10+
contrib_0:
11+
uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main
12+
with:
13+
CORE_REPO_SHA: ${{ github.sha }}
14+
CONTRIB_REPO_SHA: main

0 commit comments

Comments
 (0)