Skip to content

Commit

Permalink
Merged with remote master
Browse files Browse the repository at this point in the history
  • Loading branch information
pkerpedjiev committed Jul 19, 2024
2 parents e9794d9 + 61f2990 commit 002f8cc
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 25,444 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 12
node-version: 16
- run: sudo apt-get install xvfb
- run: npm ci
- run: npm run build --if-present
Expand All @@ -23,10 +23,10 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 12
node-version: 16
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npm run prerelease
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

**v0.3.1**
- Updated dependencies

**v0.2.9**
- New method for log value-scaling

Expand Down
10 changes: 5 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module.exports = function(config) {
'node_modules/react-dom/umd/react-dom.development.js',
'node_modules/pixi.js/dist/pixi.js',
'node_modules/react-bootstrap/dist/react-bootstrap.js',
'node_modules/bootstrap/dist/css/bootstrap.min.css',
//'test/**/*.+(js|jsx)',
'test/SVGExportTests.js',
'test/StackedBarTests.js',
Expand All @@ -37,7 +36,7 @@ module.exports = function(config) {
'karma-jasmine',
'karma-sourcemap-loader',
'karma-chrome-launcher',
'karma-phantomjs2-launcher',
'karma-phantomjs-launcher',
],

babelPreprocessor: {
Expand All @@ -53,14 +52,15 @@ module.exports = function(config) {
browsers: ['Chrome'],
singleRun: false,
customLaunchers: {
Chrome_travis_ci: {
Chrome_ci: {
base: 'Chrome',
flags: ['--no-sandbox'],
},
},
});

if (process.env.TRAVIS) {
config.browsers = ['Chrome_travis_ci'];
if (process.env.GITHUB_ACTIONS) {
config.browsers = ['Chrome_ci'];
config.singleRun = true;
}
};
Loading

0 comments on commit 002f8cc

Please sign in to comment.