Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pipeline {
NOTIFY_TO = '[email protected]'
NPMRC_SECRET = 'secret/jenkins-ci/npmjs/elasticmachine'
TOTP_SECRET = 'totp/code/npmjs-elasticmachine'
BUILD_NODE_VERSION = 'v16.15.0'
BUILD_NODE_VERSION = 'v16.15.1'
DOCKER_REGISTRY = 'docker.elastic.co'
DOCKER_SECRET = 'secret/apm-team/ci/docker-registry/prod'
}
Expand Down
11 changes: 7 additions & 4 deletions dev-utils/gen-notice.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,16 @@ DIST_DIR="$1"
[[ -n "$DIST_DIR" ]] || fatal "missing DIST_DIR argument"
[[ -f "$DIST_DIR/package.json" ]] || fatal "invalid DIST_DIR: $DIST_DIR/package.json does not exist"

# Guard against accidentally using this script with a too-old npm.
if [[ $(npm --version | cut -d. -f1) -lt 8 ]]; then
# Guard against accidentally using this script with a too-old npm (<v8.7.0).
npmVer=$(npm --version)
npmMajorVer=$(echo "$npmVer" | cut -d. -f1)
npmMinorVer=$(echo "$npmVer" | cut -d. -f2)
if [[ $npmMajorVer -lt 8 || ($npmMajorVer -eq 8 && $npmMinorVer -lt 7) ]]; then
if [[ "$LINT_MODE" == "true" ]]; then
warn "npm version is too old for 'npm ci --omit=dev': $(npm --version)"
warn "npm version is too old for 'npm ci --omit=dev': $npmVer"
exit 0
fi
fatal "npm version is too old for 'npm ci --omit=dev': $(npm --version)"
fatal "npm version is too old for 'npm ci --omit=dev': $npmVer"
fi

# Directory holding some "license.*.txt" files for inclusion below.
Expand Down