Skip to content

Commit 2110d35

Browse files
committed
squash: tweaks for dependabot
1 parent 02a276e commit 2110d35

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

Gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66

77
source 'https://rubygems.org'
88

9+
# Due to a bug in Dependabot Core, we cannot update instrumentation gems because
10+
# they reference each other using local paths in their Gemfiles.
11+
#
12+
# This list of gems will be tracked and updated by Dependabot and we can then update them manually
13+
# bin/update-dependencies <gem-name> <new-version>
14+
gem 'opentelemetry-api', '~> 1.7'
15+
gem 'opentelemetry-common', '~> 0.21'
16+
gem 'opentelemetry-registry', '~> 0.1'
17+
gem 'opentelemetry-sdk', '~> 1.1'
18+
919
gem 'rake', '~> 13.0'
1020
gem 'rubocop', '~> 1.81.1'
1121
gem 'rubocop-performance', '~> 1.26.0'

bin/update-dependencies

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ fi
1010

1111
for file in $(git ls-files \*Gemfile \*.gemspec)
1212
do
13-
sed -i -E "s/'$1', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'$1', '~> $2'/" "$file"
13+
# Portable sed -i for both macOS (BSD) and Linux (GNU)
14+
if [[ "$OSTYPE" == "darwin"* ]]; then
15+
# macOS requires an extension argument (use '' for no backup)
16+
sed -i '' -E "s/'$1', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'$1', '~> $2'/" "$file"
17+
else
18+
# Linux doesn't require an extension argument
19+
sed -i -E "s/'$1', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'$1', '~> $2'/" "$file"
20+
fi
1421
done
1522

1623
echo "Review your changes and commit"

0 commit comments

Comments
 (0)