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

Commit

Permalink
Merge pull request #154 from Caleydo/release-8.0.0
Browse files Browse the repository at this point in the history
Release 8.0.0
  • Loading branch information
Anita Steiner authored Feb 12, 2021
2 parents 577c805 + 4bcbe4b commit 7e675d2
Show file tree
Hide file tree
Showing 36 changed files with 178 additions and 150 deletions.
47 changes: 38 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
version: 2
jobs:
build:
version: 2.1

executors:
node-executor:
working_directory: ~/phovea
docker:
- image: circleci/node:12.13-buster-browsers

jobs:
build:
executor: node-executor
steps:
- checkout
- run:
Expand All @@ -22,8 +27,7 @@ jobs:
(grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf
- save_cache:
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
paths:
- ./node_modules
paths: ./node_modules
- run:
name: Install npm dependencies from git repositories (always get latest commit)
command: npm install
Expand All @@ -35,8 +39,23 @@ jobs:
command: npm run dist
- store_artifacts:
path: dist
- persist_to_workspace:
root: ~/phovea
paths: .
publish:
executor: node-executor
steps:
- attach_workspace:
at: ~/phovea
- run:
name: Authentication
command: |
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
- run:
name: Publish package
command: npm publish
workflows:
version: 2
version: 2.1
# build-nightly:
# triggers:
# - schedule:
Expand All @@ -47,17 +66,27 @@ workflows:
# - develop
# jobs:
# - build
build-branch:
build-branches-only:
jobs:
- build:
filters:
tags:
ignore: /^v.*/
build-tag:
ignore: /.*/
build-publish-tag:
jobs:
- build:
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- publish:
context:
- org-public
requires:
- build
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,10 @@ AUTHORS text
# with the python modules ``pickle``, ``dbm.*``,
# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
# (among others).


# Mark compiled files as generated to hide them in PRs
/dist/** linguist-generated=true

# Hide compiled files from git diff and auto-replace them when merging different branches
/dist/** -diff -merge
21 changes: 19 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
# general things to ignore
/.tscache
/.idea
/build/
/dist/tsBuildInfoFile
/lib/
*.egg-info/
*.egg
*.py[cod]
__pycache__/
*.so
*~
*.log
*.pot
*.pyc
*.swp
*.lock
# due to using tox and pytest
.tox
.cache
node_modules/
/src/**/*.js
/tests/**/*.js
/src/**/*.map
/tests/**/*.map
/tests/**/*.map
*.css
*.log
/.cache-loader
package-lock.json
4 changes: 2 additions & 2 deletions dist/menu/ACommonSubSection.js

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

2 changes: 1 addition & 1 deletion dist/menu/ACommonSubSection.js.map

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

1 change: 0 additions & 1 deletion dist/menu/SpeciesSelectorMenuSection.d.ts

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

5 changes: 2 additions & 3 deletions dist/menu/SpeciesSelectorMenuSection.js

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

Loading

0 comments on commit 7e675d2

Please sign in to comment.