Skip to content

Commit 580a97f

Browse files
authored
Merge branch 'master' into chore/update-libpcre
2 parents 02b4135 + 720affa commit 580a97f

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
sparse-checkout-cone-mode: false
2020
repository: opentracing-contrib/common
2121

22-
- uses: actions/labeler@v5
22+
- uses: actions/labeler@v6
2323
continue-on-error: true
2424
with:
2525
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/system-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "nginx_version=$(grep -m1 'FROM nginx:' <Dockerfile | awk -F'[: ]' '{print $3}')" >> $GITHUB_OUTPUT
3333
3434
- name: Setup Python
35-
uses: actions/setup-python@v5
35+
uses: actions/setup-python@v6
3636
with:
3737
python-version-file: ".python-version"
3838
cache: "pip"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.17
1+
# syntax=docker/dockerfile:1.18
22
ARG BUILD_OS=debian
33
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1 AS xx
44

example/go/otel/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
otel:
3-
image: otel/opentelemetry-collector-contrib:0.133.0
3+
image: otel/opentelemetry-collector-contrib:0.134.1
44
volumes:
55
- ./otel.yml:/etc/otelcol/config.yaml
66

@@ -22,7 +22,7 @@ services:
2222
- "8082:8082"
2323

2424
jaeger:
25-
image: jaegertracing/all-in-one:1.72.0
25+
image: jaegertracing/all-in-one:1.73.0
2626
environment:
2727
- LOG_LEVEL=debug
2828
- COLLECTOR_ZIPKIN_HOST_PORT=:9411

example/zoo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nginx-opentracing-zoo",
33
"version": "1.0.0",
44
"devDependencies": {
5-
"eslint": "^9.34.0",
5+
"eslint": "^9.35.0",
66
"eslint-config-airbnb-base": "^15.0.0",
77
"eslint-plugin-import": "^2.32.0"
88
},

0 commit comments

Comments
 (0)