Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit 7e675d2

Browse files
author
Anita Steiner
authored
Merge pull request #154 from Caleydo/release-8.0.0
Release 8.0.0
2 parents 577c805 + 4bcbe4b commit 7e675d2

36 files changed

Lines changed: 178 additions & 150 deletions

.circleci/config.yml

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
version: 2
2-
jobs:
3-
build:
1+
version: 2.1
2+
3+
executors:
4+
node-executor:
45
working_directory: ~/phovea
56
docker:
67
- image: circleci/node:12.13-buster-browsers
8+
9+
jobs:
10+
build:
11+
executor: node-executor
712
steps:
813
- checkout
914
- run:
@@ -22,8 +27,7 @@ jobs:
2227
(grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf
2328
- save_cache:
2429
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
25-
paths:
26-
- ./node_modules
30+
paths: ./node_modules
2731
- run:
2832
name: Install npm dependencies from git repositories (always get latest commit)
2933
command: npm install
@@ -35,8 +39,23 @@ jobs:
3539
command: npm run dist
3640
- store_artifacts:
3741
path: dist
42+
- persist_to_workspace:
43+
root: ~/phovea
44+
paths: .
45+
publish:
46+
executor: node-executor
47+
steps:
48+
- attach_workspace:
49+
at: ~/phovea
50+
- run:
51+
name: Authentication
52+
command: |
53+
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
54+
- run:
55+
name: Publish package
56+
command: npm publish
3857
workflows:
39-
version: 2
58+
version: 2.1
4059
# build-nightly:
4160
# triggers:
4261
# - schedule:
@@ -47,17 +66,27 @@ workflows:
4766
# - develop
4867
# jobs:
4968
# - build
50-
build-branch:
69+
build-branches-only:
5170
jobs:
5271
- build:
5372
filters:
5473
tags:
55-
ignore: /^v.*/
56-
build-tag:
74+
ignore: /.*/
75+
build-publish-tag:
5776
jobs:
5877
- build:
5978
filters:
6079
branches:
6180
ignore: /.*/
6281
tags:
6382
only: /^v.*/
83+
- publish:
84+
context:
85+
- org-public
86+
requires:
87+
- build
88+
filters:
89+
branches:
90+
ignore: /.*/
91+
tags:
92+
only: /^v.*/

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,10 @@ AUTHORS text
125125
# with the python modules ``pickle``, ``dbm.*``,
126126
# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
127127
# (among others).
128+
129+
130+
# Mark compiled files as generated to hide them in PRs
131+
/dist/** linguist-generated=true
132+
133+
# Hide compiled files from git diff and auto-replace them when merging different branches
134+
/dist/** -diff -merge

.gitignore

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
1+
# general things to ignore
12
/.tscache
23
/.idea
4+
/build/
5+
/dist/tsBuildInfoFile
36
/lib/
7+
*.egg-info/
8+
*.egg
9+
*.py[cod]
10+
__pycache__/
11+
*.so
12+
*~
13+
*.log
14+
*.pot
15+
*.pyc
16+
*.swp
17+
*.lock
18+
# due to using tox and pytest
19+
.tox
20+
.cache
421
node_modules/
522
/src/**/*.js
623
/tests/**/*.js
724
/src/**/*.map
8-
/tests/**/*.map
25+
/tests/**/*.map
926
*.css
10-
*.log
27+
/.cache-loader
1128
package-lock.json

dist/menu/ACommonSubSection.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/menu/ACommonSubSection.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/menu/SpeciesSelectorMenuSection.d.ts

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/menu/SpeciesSelectorMenuSection.js

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)