Skip to content
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

[Gally]: master <- dev #2

Merged
merged 3 commits into from
May 15, 2019
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
5 changes: 5 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"presets": [],
"plugins": ["@babel/plugin-proposal-object-rest-spread"],
"sourceMaps": "inline"
}
123 changes: 123 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally-create-pr
- test-node-v10:
requires:
- gally-create-pr
- test-node-v8.10:
requires:
- gally-create-pr
- gally-auto-merge:
requires:
- gally-create-pr
- test-node-v10
- test-node-v8.10
filters:
branches:
only: /dependabot\/.*/
- release:
requires:
- gally-create-pr
- test-node-v10
- test-node-v8.10
filters:
branches:
only: master
version: 2
jobs:
gally-create-pr:
docker:
- image: 'circleci/node:10'
steps:
- checkout
- run: sudo yarn global add gally
- run: ga promote $CIRCLE_BRANCH
test-node-v10:
docker:
- image: 'circleci/node:10'
steps:
- checkout
- run:
command: |
# sync submodules as checkout doesn't do this automatically
if [[ $(git config --file .gitmodules --get-regexp path) ]]; then
git submodule sync && git submodule update --init
fi
- run:
command: |
if [[ -n "${NPM_TOKEN}" ]]; then
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
fi
- run: yarn install --frozen-lockfile
- run: yarn test
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
- run:
command: |
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
yarn run coveralls
fi
test-node-v8.10:
docker:
- image: 'circleci/node:8.10'
steps:
- checkout
- run:
command: |
# sync submodules as checkout doesn't do this automatically
if [[ $(git config --file .gitmodules --get-regexp path) ]]; then
git submodule sync && git submodule update --init
fi
- run:
command: |
if [[ -n "${NPM_TOKEN}" ]]; then
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
fi
- run: yarn install --frozen-lockfile
- run: yarn test
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
gally-auto-merge:
docker:
- image: 'circleci/node:10'
steps:
- run:
name: Set PR number
command: >
echo 'export
CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"'
>> $BASH_ENV

source $BASH_ENV

echo $CIRCLE_PR_NUMBER
- checkout
- run: sudo yarn global add gally
- run: >-
ga approve $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true"
- run: >-
ga merge $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true"
release:
docker:
- image: 'circleci/node:10'
steps:
- checkout
- run:
command: |
# sync submodules as checkout doesn't do this automatically
if [[ $(git config --file .gitmodules --get-regexp path) ]]; then
git submodule sync && git submodule update --init
fi
- run:
command: |
if [[ -n "${NPM_TOKEN}" ]]; then
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
fi
- run: yarn install --frozen-lockfile
- run: yarn run semantic-release
14 changes: 14 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 1
update_configs:
- package_manager: javascript
directory: /
update_schedule: live
target_branch: dev
automerged_updates:
- match:
dependency_type: development
update_type: all
- match:
dependency_type: production
update_type: all
version_requirement_updates: increase_versions
2 changes: 2 additions & 0 deletions .depunusedignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@blackflux/eslint-plugin-rules
@blackflux/robo-config-plugin
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
41 changes: 41 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"root": true,
"extends": ["airbnb-base", "plugin:jasmine/recommended"],
"rules": {
"jasmine/expect-single-argument": 0,
"@blackflux/rules/jasmine-expect-two-arguments": 1,
"jasmine/new-line-before-expect": 0,
"@blackflux/rules/istanbul-prevent-ignore": 1,
"@blackflux/rules/kebab-case-enforce": 1,
"max-len": ["error", {"code": 120}],
"mocha/no-exclusive-tests": "error",
"prefer-destructuring": ["error", {"object": false, "array": false}],
"comma-dangle": ["error", "never"],
"indent": ["error", 2, {"SwitchCase": 1}],
"quotes": [2, "single", {"avoidEscape": true}],
"linebreak-style": [2, "unix"],
"semi": [2, "always"],
"no-unused-vars": [
1,
{"vars": "all", "args": "none", "ignoreRestSiblings": true}
],
"no-var": [1],
"no-fallthrough": [1],
"spaced-comment": [
"error",
"always",
{
"line": {"exceptions": ["-", "+"], "markers": ["=", "!"]},
"block": {
"exceptions": ["-", "+"],
"markers": ["=", "!", ":", "::"],
"balanced": true
}
}
]
},
"env": {"es6": true, "node": true, "jasmine": true, "mocha": true},
"globals": {"logger": true, "log4js": true},
"plugins": ["json", "jasmine", "mocha", "markdown", "@blackflux/rules"],
"parser": "babel-eslint"
}
37 changes: 37 additions & 0 deletions .gally.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"defaultBranch": "master",
"contribBranch": "dev",
"repository": {"url": "https://github.com/blackflux/joi-strict.git"},
"branches": {
"dev": {"upstream": "master", "protection": "$full-dev", "create": true},
"master": {"protection": "$full-master", "create": true},
"fix/*": {"upstream": "dev"},
"feat/*": {"upstream": "dev"},
"dependabot/*": {"upstream": "dev"}
},
"protection": {
"$full-dev": {
"@": "$full",
"restrictions": {"users": ["simlu", "MrsFlux"]}
},
"$full-master": {"@": "$full", "required_status_checks": {"strict": false}},
"$full": {
"required_status_checks": {
"strict": true,
"contexts": [
"ci/circleci: gally-create-pr",
"ci/circleci: test-node-v10",
"ci/circleci: test-node-v8.10"
]
},
"enforce_admins": true,
"required_pull_request_reviews": {
"dismissal_restrictions": {"users": ["simlu"], "teams": []},
"dismiss_stale_reviews": true,
"require_code_owner_reviews": true,
"required_approving_review_count": 1
},
"restrictions": {"users": ["simlu"], "teams": []}
}
}
}
90 changes: 90 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

# ----------------------------------------

# OSX Specific
.DS_Store

# ----------------------------------------

# NodeJs Specific
node_modules
npm-debug.log
yarn-error.log

# ----------------------------------------

# JS-Gardener Specific
coverage/
.coveralls.yml
lib/

# ----------------------------------------
# ----------------------------------------
# ----------------------------------------

13 changes: 13 additions & 0 deletions .idea/joi-strict.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading