-
-
Notifications
You must be signed in to change notification settings - Fork 135
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.
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
TASK: Exchange yarn with make as build tool #1633
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
9a6a322
TASK: Remove scripts from root package.json
mstruebing 61b7138
TASK: Let jenkins use the new Makefile
mstruebing b9ed7b8
TASK: Add Makefile to editorconfig
mstruebing 17053eb
TASK: Add Makefile
mstruebing b6401bf
TASK: Remove unnecessary clean as it is executed by build-production …
mstruebing cb4c5a4
TASK: Let travis use the new makefile
mstruebing d2633b4
TASK: Parameterize version
mstruebing dddc198
TASK: Format content to not go over 80 chars
mstruebing 7c483e8
TASK: Use production build for e2e tests
mstruebing 4f75092
TASK: Change Makefile to use local installed node version instead of …
mstruebing 7a6bf5f
TASK: Adjust documentation to use make
mstruebing 025df1e
TASK: Document release process
mstruebing File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,3 +12,6 @@ indent_size = 2 | |
[*.{md}] | ||
indent_size = 2 | ||
trim_trailing_whitespace = false | ||
|
||
[Makefile] | ||
indent_style = tab |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,4 +7,4 @@ set -e | |
# The script will be executed in the package working directory. | ||
# | ||
|
||
yarn test:e2e | ||
make test-e2e |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,4 +13,4 @@ set -e | |
# | ||
|
||
# Execute the unit tests. | ||
yarn test | ||
make test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,160 @@ | ||
################################################################################ | ||
# | ||
# 888b 88 88888888888 ,ad8888ba, ad88888ba | ||
# 8888b 88 88 d8"' `"8b d8" "8b | ||
# 88 `8b 88 88 d8' `8b y8, | ||
# 88 `8b 88 88aaaaa 88 88 `y8aaaaa, | ||
# 88 `8b 88 88""""" 88 88 `"""""8b, | ||
# 88 `8b 88 88 y8, ,8p `8b | ||
# 88 `8888 88 y8a. .a8p y8a a8p | ||
# 88 `888 88888888888 `"Y8888Y"' "Y88888P" | ||
# | ||
# <Makefile> | ||
# | ||
# 88 88 88 | ||
# 88 88 88 | ||
# 88 88 88 | ||
# 88 88 88 | ||
# 88 88 88 | ||
# 88 88 88 | ||
# Y8a. .a8P 88 | ||
# `"Y8888Y"' 88 | ||
# | ||
# | ||
################################################################################ | ||
|
||
|
||
################################################################################ | ||
# Variables | ||
################################################################################ | ||
|
||
|
||
# Add node_modules and composer binaries to $PATH | ||
export PATH := ./node_modules/.bin:./bin:$(PATH) | ||
|
||
|
||
################################################################################ | ||
# Setup | ||
################################################################################ | ||
|
||
|
||
check-requirements: | ||
@which yarn &>/dev/null || \ | ||
(echo yarn is not installed: https://github.com/yarnpkg/yarn && false) | ||
|
||
install: | ||
yarn install | ||
|
||
setup: check-requirements install build | ||
@echo Please remember to set frontendDevelopmentMode \ | ||
to true in your Settings.yaml. | ||
@echo | ||
@echo 'Neos:' | ||
@echo ' Neos:' | ||
@echo ' Ui:' | ||
@echo ' frontendDevelopmentMode: true' | ||
|
||
|
||
################################################################################ | ||
# Builds | ||
################################################################################ | ||
|
||
|
||
# TODO: figure out how to pass a parameter to other targets to reduce redundancy | ||
build: | ||
NEOS_BUILD_ROOT=$(shell pwd) webpack --progress --colors | ||
|
||
build-watch: | ||
NEOS_BUILD_ROOT=$(shell pwd) webpack --progress --colors --watch | ||
|
||
build-watch-poll: | ||
NEOS_BUILD_ROOT=$(shell pwd) webpack \ | ||
--progress --colors --watch-poll --watch | ||
|
||
# clean anything before building for production just to be sure | ||
build-production: clean install | ||
cross-env NODE_ENV=production NEOS_BUILD_ROOT=$(shell pwd) \ | ||
webpack --progress --colors | ||
|
||
|
||
################################################################################ | ||
# Code Quality | ||
################################################################################ | ||
|
||
|
||
storybook: | ||
lerna run --scope @neos-project/react-ui-components start | ||
|
||
test: | ||
lerna run test --concurrency 1 | ||
|
||
test-e2e: | ||
yarn run testcafe chrome:headless Tests/IntegrationTests/* \ | ||
--selector-timeout=30000 --assertion-timeout=30000 | ||
|
||
lint: lint-js lint-editorconfig | ||
|
||
lint-js: | ||
lerna run lint --concurrency 1 | ||
|
||
|
||
lint-editorconfig: | ||
editorconfig-checker \ | ||
--exclude-regexp 'LICENSE|\.vanilla\-css$$|banner\.js$$' \ | ||
--exclude-pattern \ | ||
'./{README.md,**/*.snap,**/*{fontAwesome,Resources}/**/*}' | ||
|
||
|
||
################################################################################ | ||
# Releasing | ||
################################################################################ | ||
|
||
|
||
called-with-version: | ||
ifeq ($(VERSION),) | ||
@echo No version information given. | ||
@echo Please run this command like this: | ||
@echo VERSION=1.0.0 make release | ||
@false | ||
endif | ||
|
||
bump-version: called-with-version | ||
lerna publish \ | ||
--skip-git --exact --repo-version=$(VERSION) \ | ||
--yes --force-publish --skip-npm | ||
./Build/createVersionFile.sh | ||
|
||
publish-npm: called-with-version | ||
lerna publish --skip-git --exact --repo-version=$(VERSION) \ | ||
--yes --force-publish | ||
|
||
tag: called-with-version | ||
git tag $(VERSION) | ||
|
||
# make a clean build from scratch | ||
# and make sure that every lint and test stage is running through | ||
release: called-with-version check-requirements \ | ||
build-production \ | ||
lint lint-editorconfig \ | ||
test test-e2e \ | ||
bump-version publish-npm tag | ||
@echo | ||
@echo | ||
@echo | ||
@echo '####################################################################' | ||
@echo | ||
@echo You should look at the git diff carefully and commit your changes | ||
@echo | ||
@echo Then push your changes into the master and trigger the jenkins build. | ||
|
||
|
||
################################################################################ | ||
# Misc | ||
################################################################################ | ||
|
||
|
||
clean: | ||
rm -Rf node_modules; rm -rf packages/*/node_modules | ||
|
||
|
||
.PHONY: $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could Jenkins do everything, including
make release
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general yeah. We need to give him access to master branch and should find some way to only commit stuff we expect to change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Master is generally protected, I don't know how to change that especially only for jenkins, we should not be able to push into master.