Skip to content

Commit e36f52c

Browse files
authored
Consolidate tools directories, move things to internal/tools (#2534)
1 parent 639a06c commit e36f52c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ table-check:
8585

8686
.PHONY: schema-check
8787
schema-check:
88-
cd tools && ./schema_check.sh
88+
$(TOOLS_DIR)/schema_check.sh
8989

9090
# Run all checks in order of speed / likely failure.
9191
.PHONY: check
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ BUILD_TOOL_SCHEMAS_VERSION=0.11.0
1111
# List of vesions that do not require or have a schema.
1212
declare -a skip_versions=("1.0.0" "1.0.1" "1.1.0" "1.2.0" "1.3.0" "1.6.0")
1313

14-
schemas_dir="../schemas"
15-
current_dir=$PWD
14+
root_dir=$PWD
15+
schemas_dir=$root_dir/schemas
1616

1717
# Find all version sections in CHANGELOG that start with a number in 1..9 range.
18-
grep -o -e '## v[1-9].*\s' ../CHANGELOG.md | grep -o '[1-9].*' | while read ver; do
18+
grep -o -e '## v[1-9].*\s' $root_dir/CHANGELOG.md | grep -o '[1-9].*' | while read ver; do
1919
if [[ " ${skip_versions[*]} " == *" $ver "* ]]; then
2020
# Skip this version, it does not need a schema file.
2121
continue
@@ -52,7 +52,7 @@ for file in $schemas_dir/*; do
5252
exit 2
5353
fi
5454

55-
docker run -v $current_dir/../schemas:/schemas \
55+
docker run -v $schemas_dir:/schemas \
5656
otel/build-tool-schemas:$BUILD_TOOL_SCHEMAS_VERSION --file /schemas/$ver --version=$ver
5757

5858
echo "OK"

0 commit comments

Comments
 (0)