From 6e29e0e5f19ee08eaf683166f2867dd2d383f67e Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Tue, 5 Nov 2024 08:48:58 +0000 Subject: [PATCH 1/6] Update version to 1.29.0.dev/0.50b0.dev --- CHANGELOG.md | 2 ++ eachdist.ini | 4 ++-- exporter/opentelemetry-exporter-opencensus/pyproject.toml | 2 +- .../opentelemetry/exporter/opencensus/version/__init__.py | 2 +- .../opentelemetry-exporter-otlp-proto-common/pyproject.toml | 2 +- .../exporter/otlp/proto/common/version/__init__.py | 2 +- .../opentelemetry-exporter-otlp-proto-grpc/pyproject.toml | 6 +++--- .../exporter/otlp/proto/grpc/version/__init__.py | 2 +- .../opentelemetry-exporter-otlp-proto-http/pyproject.toml | 6 +++--- .../exporter/otlp/proto/http/version/__init__.py | 2 +- exporter/opentelemetry-exporter-otlp/pyproject.toml | 4 ++-- .../src/opentelemetry/exporter/otlp/version/__init__.py | 2 +- exporter/opentelemetry-exporter-prometheus/pyproject.toml | 2 +- .../opentelemetry/exporter/prometheus/version/__init__.py | 2 +- .../opentelemetry/exporter/zipkin/json/version/__init__.py | 2 +- .../opentelemetry-exporter-zipkin-proto-http/pyproject.toml | 2 +- .../exporter/zipkin/proto/http/version/__init__.py | 2 +- exporter/opentelemetry-exporter-zipkin/pyproject.toml | 4 ++-- .../src/opentelemetry/exporter/zipkin/version/__init__.py | 2 +- opentelemetry-api/src/opentelemetry/version/__init__.py | 2 +- .../src/opentelemetry/proto/version/__init__.py | 2 +- opentelemetry-sdk/pyproject.toml | 4 ++-- opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py | 2 +- opentelemetry-semantic-conventions/pyproject.toml | 2 +- .../src/opentelemetry/semconv/version/__init__.py | 2 +- .../src/opentelemetry/propagators/b3/version/__init__.py | 2 +- .../opentelemetry/propagators/jaeger/version/__init__.py | 2 +- .../src/opentelemetry/shim/opencensus/version/__init__.py | 2 +- .../opentelemetry/shim/opentracing_shim/version/__init__.py | 2 +- tests/opentelemetry-test-utils/pyproject.toml | 4 ++-- .../src/opentelemetry/test/version/__init__.py | 2 +- 31 files changed, 41 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index deef579cfaa..e7f7bc69004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## Version 1.28.0/0.49b0 (2024-11-05) + - Removed superfluous py.typed markers and added them where they were missing ([#4172](https://github.com/open-telemetry/opentelemetry-python/pull/4172)) - Include metric info in encoding exceptions diff --git a/eachdist.ini b/eachdist.ini index dc998424496..ba48854a923 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -11,7 +11,7 @@ sortfirst= exporter/* [stable] -version=1.28.0.dev +version=1.29.0.dev packages= opentelemetry-sdk @@ -27,7 +27,7 @@ packages= opentelemetry-api [prerelease] -version=0.49b0.dev +version=0.50b0.dev packages= opentelemetry-opentracing-shim diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml index 1c9af54af1a..2ee25fab539 100644 --- a/exporter/opentelemetry-exporter-opencensus/pyproject.toml +++ b/exporter/opentelemetry-exporter-opencensus/pyproject.toml @@ -30,7 +30,7 @@ classifiers = [ dependencies = [ "grpcio >= 1.0.0, < 2.0.0", "opencensus-proto >= 0.1.0, < 1.0.0", - "opentelemetry-api >= 1.28.0.dev", + "opentelemetry-api >= 1.29.0.dev", "opentelemetry-sdk >= 1.15", "protobuf ~= 3.13", "setuptools >= 16.0", diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py index ee5a6342e70..0559ba62275 100644 --- a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py +++ b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.49b0.dev" +__version__ = "0.50b0.dev" diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml index 6aa455e615d..b3c0765559f 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ "Programming Language :: Python :: 3.12", ] dependencies = [ - "opentelemetry-proto == 1.28.0.dev", + "opentelemetry-proto == 1.29.0.dev", ] [project.urls] diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml index f6f48d9205e..0e931b06c9c 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml @@ -31,9 +31,9 @@ dependencies = [ "googleapis-common-protos ~= 1.52", "grpcio >= 1.63.2, < 2.0.0", "opentelemetry-api ~= 1.15", - "opentelemetry-proto == 1.28.0.dev", - "opentelemetry-sdk ~= 1.28.0.dev", - "opentelemetry-exporter-otlp-proto-common == 1.28.0.dev", + "opentelemetry-proto == 1.29.0.dev", + "opentelemetry-sdk ~= 1.29.0.dev", + "opentelemetry-exporter-otlp-proto-common == 1.29.0.dev", ] [project.entry-points.opentelemetry_logs_exporter] diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml index b062d94e35a..3e71211e857 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml @@ -30,9 +30,9 @@ dependencies = [ "Deprecated >= 1.2.6", "googleapis-common-protos ~= 1.52", "opentelemetry-api ~= 1.15", - "opentelemetry-proto == 1.28.0.dev", - "opentelemetry-sdk ~= 1.28.0.dev", - "opentelemetry-exporter-otlp-proto-common == 1.28.0.dev", + "opentelemetry-proto == 1.29.0.dev", + "opentelemetry-sdk ~= 1.29.0.dev", + "opentelemetry-exporter-otlp-proto-common == 1.29.0.dev", "requests ~= 2.7", ] diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/exporter/opentelemetry-exporter-otlp/pyproject.toml b/exporter/opentelemetry-exporter-otlp/pyproject.toml index 5812c296af3..3996f57dce3 100644 --- a/exporter/opentelemetry-exporter-otlp/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp/pyproject.toml @@ -28,8 +28,8 @@ classifiers = [ "Typing :: Typed", ] dependencies = [ - "opentelemetry-exporter-otlp-proto-grpc == 1.28.0.dev", - "opentelemetry-exporter-otlp-proto-http == 1.28.0.dev", + "opentelemetry-exporter-otlp-proto-grpc == 1.29.0.dev", + "opentelemetry-exporter-otlp-proto-http == 1.29.0.dev", ] [project.entry-points.opentelemetry_logs_exporter] diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py +++ b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/exporter/opentelemetry-exporter-prometheus/pyproject.toml b/exporter/opentelemetry-exporter-prometheus/pyproject.toml index 33844ef9391..465115b8abb 100644 --- a/exporter/opentelemetry-exporter-prometheus/pyproject.toml +++ b/exporter/opentelemetry-exporter-prometheus/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ dependencies = [ "opentelemetry-api ~= 1.12", # DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release - "opentelemetry-sdk ~= 1.28.0.dev", + "opentelemetry-sdk ~= 1.29.0.dev", "prometheus_client >= 0.5.0, < 1.0.0", ] diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py index ee5a6342e70..0559ba62275 100644 --- a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py +++ b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.49b0.dev" +__version__ = "0.50b0.dev" diff --git a/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml index 10d43412b79..51487a278e2 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.3", - "opentelemetry-exporter-zipkin-json == 1.28.0.dev", + "opentelemetry-exporter-zipkin-json == 1.29.0.dev", "opentelemetry-sdk ~= 1.11", "protobuf ~= 3.12", "requests ~= 2.7", diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml index 59b0a9c6041..ce5163f65e1 100644 --- a/exporter/opentelemetry-exporter-zipkin/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin/pyproject.toml @@ -28,8 +28,8 @@ classifiers = [ "Typing :: Typed", ] dependencies = [ - "opentelemetry-exporter-zipkin-json == 1.28.0.dev", - "opentelemetry-exporter-zipkin-proto-http == 1.28.0.dev", + "opentelemetry-exporter-zipkin-json == 1.29.0.dev", + "opentelemetry-exporter-zipkin-proto-http == 1.29.0.dev", ] [project.entry-points.opentelemetry_traces_exporter] diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/opentelemetry-api/src/opentelemetry/version/__init__.py b/opentelemetry-api/src/opentelemetry/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/opentelemetry-api/src/opentelemetry/version/__init__.py +++ b/opentelemetry-api/src/opentelemetry/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py b/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py +++ b/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/opentelemetry-sdk/pyproject.toml b/opentelemetry-sdk/pyproject.toml index 1a3b945d055..7d4f5cefba7 100644 --- a/opentelemetry-sdk/pyproject.toml +++ b/opentelemetry-sdk/pyproject.toml @@ -27,8 +27,8 @@ classifiers = [ "Typing :: Typed", ] dependencies = [ - "opentelemetry-api == 1.28.0.dev", - "opentelemetry-semantic-conventions == 0.49b0.dev", + "opentelemetry-api == 1.29.0.dev", + "opentelemetry-semantic-conventions == 0.50b0.dev", "typing-extensions >= 3.7.4", ] diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/opentelemetry-semantic-conventions/pyproject.toml b/opentelemetry-semantic-conventions/pyproject.toml index 85c2ccd9249..279c368a273 100644 --- a/opentelemetry-semantic-conventions/pyproject.toml +++ b/opentelemetry-semantic-conventions/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] dependencies = [ - "opentelemetry-api == 1.28.0.dev", + "opentelemetry-api == 1.29.0.dev", "Deprecated >= 1.2.6", ] diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py index ee5a6342e70..0559ba62275 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.49b0.dev" +__version__ = "0.50b0.dev" diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py +++ b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py index 38affcb12ca..68e87f6e791 100644 --- a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py +++ b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.28.0.dev" +__version__ = "1.29.0.dev" diff --git a/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py b/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py index ee5a6342e70..0559ba62275 100644 --- a/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py +++ b/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.49b0.dev" +__version__ = "0.50b0.dev" diff --git a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py index ee5a6342e70..0559ba62275 100644 --- a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py +++ b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.49b0.dev" +__version__ = "0.50b0.dev" diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml index 0bce586b98e..b2a7d50504b 100644 --- a/tests/opentelemetry-test-utils/pyproject.toml +++ b/tests/opentelemetry-test-utils/pyproject.toml @@ -27,8 +27,8 @@ classifiers = [ ] dependencies = [ "asgiref ~= 3.0", - "opentelemetry-api == 1.28.0.dev", - "opentelemetry-sdk == 1.28.0.dev", + "opentelemetry-api == 1.29.0.dev", + "opentelemetry-sdk == 1.29.0.dev", ] [project.urls] diff --git a/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py index 5ec76d9aa6d..9494b38d6de 100644 --- a/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py +++ b/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py @@ -1 +1 @@ -__version__ = "0.49b0.dev" +__version__ = "0.50b0.dev" From 9c56369cfeb5b16484ee0202cc348e22d67dd056 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 5 Nov 2024 14:27:48 -0800 Subject: [PATCH 2/6] SHA --- .github/workflows/lint_0.yml | 2 +- .github/workflows/misc_0.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 71b148c02d5..cd3cd7bda19 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: main + CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c PIP_EXISTS_ACTION: w jobs: diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml index e4466574fe5..1802b746f06 100644 --- a/.github/workflows/misc_0.yml +++ b/.github/workflows/misc_0.yml @@ -11,7 +11,7 @@ on: env: CORE_REPO_SHA: main - CONTRIB_REPO_SHA: main + CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c PIP_EXISTS_ACTION: w jobs: From 844e57b21a117054bbf1d1bda0f8a208b6303829 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 5 Nov 2024 15:42:09 -0800 Subject: [PATCH 3/6] links --- .github/workflows/check-links.yml | 4 +++- .github/workflows/check_links_config.json | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml index d9d1514076b..8fd2767aa88 100644 --- a/.github/workflows/check-links.yml +++ b/.github/workflows/check-links.yml @@ -19,7 +19,9 @@ jobs: - name: Get changed files id: changes run: | - echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)" >> $GITHUB_OUTPUT + md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs) + echo "Markdown files changed: $md" + echo "md=$md" >> $GITHUB_OUTPUT check-links: runs-on: ubuntu-latest needs: changedfiles diff --git a/.github/workflows/check_links_config.json b/.github/workflows/check_links_config.json index 4f17e90626f..97f2cc1ba4d 100644 --- a/.github/workflows/check_links_config.json +++ b/.github/workflows/check_links_config.json @@ -6,6 +6,9 @@ { "pattern": "http(s)?://localhost" }, + { + "pattern": "http(s)?://example.com" + }, { "pattern": "http(s)?://example.com" } From 1410efb88fd28af79abae80510fc41e6e3eda694 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 5 Nov 2024 15:56:02 -0800 Subject: [PATCH 4/6] skip --- .github/workflows/check-links.yml | 5 ++--- .github/workflows/check_links_config.json | 3 --- .github/workflows/misc_0.yml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml index 8fd2767aa88..4c629753951 100644 --- a/.github/workflows/check-links.yml +++ b/.github/workflows/check-links.yml @@ -19,9 +19,7 @@ jobs: - name: Get changed files id: changes run: | - md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs) - echo "Markdown files changed: $md" - echo "md=$md" >> $GITHUB_OUTPUT + echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)" >> $GITHUB_OUTPUT check-links: runs-on: ubuntu-latest needs: changedfiles @@ -40,5 +38,6 @@ jobs: markdown-link-check \ --verbose \ --config .github/workflows/check_links_config.json \ + --skip-path CHANGELOG.md \ ${{needs.changedfiles.outputs.md}} \ || { echo "Check that anchor links are lowercase"; exit 1; } diff --git a/.github/workflows/check_links_config.json b/.github/workflows/check_links_config.json index 97f2cc1ba4d..4f17e90626f 100644 --- a/.github/workflows/check_links_config.json +++ b/.github/workflows/check_links_config.json @@ -6,9 +6,6 @@ { "pattern": "http(s)?://localhost" }, - { - "pattern": "http(s)?://example.com" - }, { "pattern": "http(s)?://example.com" } diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml index 1802b746f06..3e8aa7cf1b4 100644 --- a/.github/workflows/misc_0.yml +++ b/.github/workflows/misc_0.yml @@ -215,7 +215,7 @@ jobs: runs-on: ubuntu-latest if: | !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows') - && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request' + && github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request' steps: - name: Checkout repo @ SHA - ${{ github.sha }} uses: actions/checkout@v4 From 64b363f2b6af54dfda1126c31b73ed85aaadd531 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 5 Nov 2024 16:06:27 -0800 Subject: [PATCH 5/6] Update check_links_config.json --- .github/workflows/check_links_config.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/check_links_config.json b/.github/workflows/check_links_config.json index 4f17e90626f..7f010a5afa2 100644 --- a/.github/workflows/check_links_config.json +++ b/.github/workflows/check_links_config.json @@ -8,6 +8,9 @@ }, { "pattern": "http(s)?://example.com" + }, + { + "pattern": "CHANGELOG.md" } ], "aliveStatusCodes": [429, 200] From 792b2b88f65cb868ccf0b131b1c5feb33f6a562b Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 5 Nov 2024 16:13:03 -0800 Subject: [PATCH 6/6] ignore --- .github/workflows/check-links.yml | 6 ++++-- .github/workflows/check_links_config.json | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml index 4c629753951..770bd241687 100644 --- a/.github/workflows/check-links.yml +++ b/.github/workflows/check-links.yml @@ -23,7 +23,10 @@ jobs: check-links: runs-on: ubuntu-latest needs: changedfiles - if: ${{needs.changedfiles.outputs.md}} + if: + if: | + github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request' + && ${{needs.changedfiles.outputs.md}} steps: - name: Checkout Repo uses: actions/checkout@v4 @@ -38,6 +41,5 @@ jobs: markdown-link-check \ --verbose \ --config .github/workflows/check_links_config.json \ - --skip-path CHANGELOG.md \ ${{needs.changedfiles.outputs.md}} \ || { echo "Check that anchor links are lowercase"; exit 1; } diff --git a/.github/workflows/check_links_config.json b/.github/workflows/check_links_config.json index 7f010a5afa2..4f17e90626f 100644 --- a/.github/workflows/check_links_config.json +++ b/.github/workflows/check_links_config.json @@ -8,9 +8,6 @@ }, { "pattern": "http(s)?://example.com" - }, - { - "pattern": "CHANGELOG.md" } ], "aliveStatusCodes": [429, 200]