Skip to content

Commit

Permalink
Merge pull request #300 from lsst-ts/release/5.0.0
Browse files Browse the repository at this point in the history
Release/5.0.0
  • Loading branch information
areyesd14 authored May 4, 2021
2 parents 7be8788 + 0390360 commit 5f3f7c8
Show file tree
Hide file tree
Showing 79 changed files with 1,565 additions and 591 deletions.
7 changes: 5 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ repos:
rev: v2.2.1
hooks:
- id: prettier
types: [javascript]
files: \.[j]sx?$ # *.js and *.jsx
types: [file]

- repo: https://github.com/pre-commit/mirrors-eslint
rev: v7.19.0
hooks:
- id: eslint
- id: eslint
files: \.[j]sx?$ # *.js and *.jsx
types: [file]
4 changes: 3 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pipeline {
branch "bugfix/*"
branch "hotfix/*"
branch "release/*"
branch "tickets/*"
}
}
steps {
Expand All @@ -27,7 +28,7 @@ pipeline {
if (slashPosition > 0) {
git_tag = git_branch.substring(slashPosition + 1, git_branch.length())
git_branch = git_branch.substring(0, slashPosition)
if (git_branch == "release" || git_branch == "hotfix" || git_branch == "bugfix") {
if (git_branch == "release" || git_branch == "hotfix" || git_branch == "bugfix" || git_branch == "tickets") {
image_tag = git_tag
}
}
Expand All @@ -45,6 +46,7 @@ pipeline {
branch "bugfix/*"
branch "hotfix/*"
branch "release/*"
branch "tickets/*"
}
}
steps {
Expand Down
2 changes: 2 additions & 0 deletions love/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"html2canvas": "^1.0.0-rc.5",
"lodash": "^4.17.19",
"lodash.throttle": "^4.1.1",
"lodash.debounce": "^4.0.8",
"luxon": "^1.23.0",
"ml-matrix": "^6.5.0",
"moment-range": "^4.0.0",
Expand Down Expand Up @@ -45,6 +46,7 @@
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0",
"redux-undo": "^1.0.0",
"remarkable": "^2.0.1",
"reselect": "^4.0.0",
"resize-observer-polyfill": "^1.5.1",
"rfdc": "^1.1.4",
Expand Down
Loading

0 comments on commit 5f3f7c8

Please sign in to comment.