Skip to content
This repository has been archived by the owner on Mar 16, 2022. It is now read-only.

Commit

Permalink
Merge pull request #70 from datavisyn/release-4.0.0
Browse files Browse the repository at this point in the history
Release 4.0.0
  • Loading branch information
Anita Steiner authored Feb 12, 2021
2 parents f128452 + d424e05 commit f9b98a2
Show file tree
Hide file tree
Showing 14 changed files with 333 additions and 303 deletions.
56 changes: 35 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,52 @@
version: 2
jobs:
build:
working_directory: ~/datavisyn
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:
name: Show Node.js and npm version
command: |
node -v
npm -v
- restore_cache:
key: deps3-{{ .Branch }}-{{ checksum "package.json" }}
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
- run:
name: install-npm-wee
name: Install npm dependencies
command: npm install
- save_cache:
key: deps3-{{ .Branch }}-{{ checksum "package.json" }}
paths:
- ./node_modules
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
paths: ./node_modules
- run:
name: dist
name: Show installed npm dependencies
command: npm list --depth=1 || true
- run:
name: Build
command: npm run dist
- store_artifacts:
path: dist
workflows:
version: 2
build-branch:
jobs:
- build:
filters:
tags:
ignore: /^v.*/
build-tag:
version: 2.1
# build-nightly:
# triggers:
# - schedule:
# cron: "15 1 * * 1-5" # "At 01:15 on every day-of-week from Monday through Friday.”, see: https://crontab.guru/#15_1_*_*_1-5
# filters:
# branches:
# only:
# - develop
# jobs:
# - build
build-branches-and-tags:
jobs:
- build:
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
only: /.*/
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/.tscache
/.idea
/lib/
/dist/tsBuildInfoFile
/build/
/tmp
/.bower.json
Expand Down
5 changes: 5 additions & 0 deletions dist/scss/abstracts/_mixins.scss

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

2 changes: 2 additions & 0 deletions dist/scss/abstracts/_variables.scss

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

129 changes: 129 additions & 0 deletions dist/scss/base/_base.scss

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

139 changes: 3 additions & 136 deletions dist/scss/main.scss

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

2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module.exports = {
"__VERSION__": "TEST_VERSION",
"__APP_CONTEXT__": "TEST_CONTEXT",
// has to be set to true, otherwise i18n import fails
"tsConfig": {
"tsconfig": {
"esModuleInterop": true
}
},
Expand Down
Loading

0 comments on commit f9b98a2

Please sign in to comment.