Skip to content

Revert "build: sync bazel angular version placeholder" #13222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2018
Merged

Revert "build: sync bazel angular version placeholder" #13222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"stylelint": "gulp lint",
"e2e": "gulp e2e",
"deploy": "gulp deploy:devapp",
"webdriver-manager": "webdriver-manager",
"docs": "gulp docs",
"api": "gulp api-docs",
"breaking-changes": "gulp breaking-changes"
Expand Down
8 changes: 2 additions & 6 deletions packages.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,11 @@ MATERIAL_PACKAGES = [
MATERIAL_TARGETS = ["//src/lib:material"] + ["//src/lib/%s" % p for p in MATERIAL_PACKAGES]

# Each individual package uses a placeholder for the version of Angular to ensure they're
# all in-sync.
ANGULAR_PACKAGE_VERSION = ">=6.0.0 <7.0.0"

# This map is passed to each ng_package rule to stamp out the appropriate
# all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
# version for the placeholders.
ANGULAR_PACKAGE_VERSION = ">=6.0.0-beta.0 <7.0.0"
VERSION_PLACEHOLDER_REPLACEMENTS = {
"0.0.0-NG": ANGULAR_PACKAGE_VERSION,
# Note that the "0.0.0-PLACEHOLDER" for the project version is automatically being replaced.
# https://github.com/bazelbuild/rules_nodejs/blob/master/internal/npm_package/npm_package.bzl#L94
}

# Base rollup globals for everything in the repo.
Expand Down
16 changes: 0 additions & 16 deletions tools/bazel-stamp-vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@ function onError {
echo ""
}

# Function that throws an error if the Bazel Angular version does not match the
# required Angular version in the project package.json file.
function checkBazelAngularVersion {
requiredAngularVersion=$(node -p 'require("./package.json").requiredAngularVersion')
bazelAngularVersion=$(sed -nr 's/ANGULAR_PACKAGE_VERSION = "(.*)"/\1/p' ./packages.bzl)

if [[ "${requiredAngularVersion}" != "${bazelAngularVersion}" ]]; then
echo "ERROR: The required Angular version that has been specified in the 'package.json' file " \
"does not match the given Angular version in the //:packages.bzl file."
exit 1
fi
}

# Setup crash trap
trap 'onError' ERR

Expand All @@ -36,9 +23,6 @@ if [[ "$(git tag)" == "" ]]; then
echo ""
fi

# Check the Bazel Angular version to be in sync with the angular version in the package.json
checkBazelAngularVersion

# Gets a human-readable name for HEAD, e.g. "6.0.0-rc.0-15-g846ddfa"
git_version_raw=$(git describe --abbrev=7 --tags HEAD)

Expand Down