Skip to content

Commit

Permalink
Merge commit 'f2838bd8a5c8b716a28bcd9ea85bfb902c9b3357' into feature/…
Browse files Browse the repository at this point in the history
…CDS-1339-avoid-s3-cyclic-jsons

# Conflicts:
#	ci-scripts/build_nodejs_layer.sh
#	nodejs/packages/cx-wrapper/instrumentation-init.ts
#	nodejs/packages/cx-wrapper/package-lock.json
#	nodejs/packages/layer/package-lock.json
  • Loading branch information
RafalSumislawski committed Jul 4, 2024
2 parents 431ad34 + f2838bd commit 721cfad
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions ci-scripts/build_nodejs_layer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ echo OPENTELEMETRY_JS_PATH=$OPENTELEMETRY_JS_PATH
echo IITM_PATH=$IITM_PATH
echo CWD=$CWD

npm cache clean --force

pushd $OPENTELEMETRY_JS_CONTRIB_PATH > /dev/null
# Generate version files in opentelemetry-js-contrib
npx [email protected] run version:update # Newer versions have trouble with our lerna.json which contains `useWorkspaces`
Expand Down

0 comments on commit 721cfad

Please sign in to comment.