Skip to content

Commit

Permalink
Try out the new multi-directory support in dependabot. (#1283)
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerbenson committed Apr 30, 2024
1 parent 441d0a5 commit 38f5a47
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 31 deletions.
65 changes: 36 additions & 29 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
directories:
- "/"
schedule:
interval: "weekly"
groups:
actions:
patterns:
- "*"

- package-ecosystem: "gomod"
directory: "/collector"
directories:
- "/collector"
- "/collector/internal/tools"
- "/collector/lambdacomponents"
- "/collector/lambdalifecycle"
- "/collector/processor/coldstartprocessor"
- "/collector/processor/decoupleprocessor"
- "/collector/receiver/telemetryapireceiver"
schedule:
interval: "weekly"
groups:
opentelemetry-deps-collector:
patterns:
- "*opentelemetry*"
other:
patterns:
- "*"
- package-ecosystem: "gomod"
directory: "/collector/lambdacomponents"
schedule:
interval: "weekly"
groups:
opentelemetry-deps-lambdacomponents:
patterns:
- "*opentelemetry*"
other:
collector-other:
patterns:
- "*"

- package-ecosystem: "gradle"
directory: "/java"
directories:
- "/java"
schedule:
interval: "weekly"
groups:
Expand All @@ -43,44 +43,51 @@ updates:
amazon-deps:
patterns:
- "*amazon*"
other:
patterns:
- "*"
- package-ecosystem: "npm"
directory: "/nodejs"
schedule:
interval: "weekly"
groups:
all:
java-other:
patterns:
- "*"

- package-ecosystem: "npm"
directory: "/nodejs/packages/layer"
directories:
- "/nodejs"
- "/nodejs/packages/layer"
- "/nodejs/sample-apps/aws-sdk"
schedule:
interval: "weekly"
groups:
opentelemetry-deps-nodejs:
patterns:
- "@opentelemetry/*"
other:
nodejs-other:
patterns:
- "*"

- package-ecosystem: "pip"
directory: "/python/src/otel"
directories:
- "/python/src/otel"
- "/python/sample-apps/function"
- "/python/src/otel/otel_sdk"
- "/python/src/otel/tests"
schedule:
interval: "weekly"
groups:
opentelemetry-deps-python:
patterns:
- "opentelemetry-*"
python-other:
patterns:
- "*"

- package-ecosystem: "bundler"
directory: "/ruby/src/layer"
directories:
- "/ruby/src/layer"
- "/ruby/sample-apps/function"
schedule:
interval: "weekly"
groups:
opentelemetry-deps-ruby:
patterns:
- "opentelemetry-*"
other:
ruby-other:
patterns:
- "*"
2 changes: 1 addition & 1 deletion python/src/otel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /workspace

RUN mkdir -p /build && \
python3 -m pip install -r otel_sdk/requirements.txt -t /build/python && \
python3 -m pip install -r otel_sdk/requirements-nodeps.txt -t /build/tmp --no-deps && \
python3 -m pip install -r otel_sdk/nodeps-requirements.txt -t /build/tmp --no-deps && \
# We need to use a `/build/tmp/` folder otherwise the instrumentation packages
# do not get fully downloaded to the `opentelemetry/instrumentation/` path.
cp -r /build/tmp/* /build/python/ && \
Expand Down
2 changes: 1 addition & 1 deletion python/src/otel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export SDK=$(shell pwd)/otel_sdk
build-OTelLayer:
mkdir -p $(ARTIFACTS_DIR)/python
python3 -m pip install -r $(SDK)/requirements.txt -t $(ARTIFACTS_DIR)/python
python3 -m pip install -r $(SDK)/requirements-nodeps.txt -t $(ARTIFACTS_DIR)/tmp --no-deps
python3 -m pip install -r $(SDK)/nodeps-requirements.txt -t $(ARTIFACTS_DIR)/tmp --no-deps
python3 -m pip freeze --path $(ARTIFACTS_DIR)/python
cp -r $(ARTIFACTS_DIR)/tmp/* $(ARTIFACTS_DIR)/python/
rm -rf $(ARTIFACTS_DIR)/tmp
Expand Down

0 comments on commit 38f5a47

Please sign in to comment.