-
Notifications
You must be signed in to change notification settings - Fork 81
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into resolution
# Conflicts: # src/apps/weblib/cinterface.cpp # src/apps/weblib/cinterface.h # src/apps/weblib/interface.cpp # src/apps/weblib/interface.h # src/apps/weblib/ts-api/cvizzu.types.d.ts # src/apps/weblib/ts-api/module/cchart.ts # src/base/gui/widget.h # src/chart/main/chart.h # src/chart/ui/chart.cpp # src/chart/ui/chart.h # test/integration/test_cases/test_cases.json # test/integration/tests/config_tests.json # test/integration/tests/features.json # test/integration/tests/fixes.json
- Loading branch information
Showing
2,913 changed files
with
153,231 additions
and
148,693 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,25 @@ | ||
module.exports = { | ||
env: { | ||
browser: true, | ||
jest: true | ||
}, | ||
extends: ['standard', 'prettier'], | ||
root: true, | ||
parserOptions: { | ||
ecmaVersion: 'latest' | ||
}, | ||
overrides: [ | ||
{ | ||
files: ['test/integration/test_cases/**', 'test/integration/test_data/**'], | ||
rules: { | ||
camelcase: 'off' | ||
} | ||
}, | ||
{ | ||
files: ['*.ts', '*.tsx'], | ||
extends: ['standard', 'prettier', 'plugin:@typescript-eslint/recommended'], | ||
parser: '@typescript-eslint/parser', | ||
plugins: ['@typescript-eslint'], | ||
rules: { | ||
'no-use-before-define': 'off', | ||
'@typescript-eslint/no-use-before-define': 'error', | ||
'@typescript-eslint/explicit-function-return-type': ['error'] | ||
} | ||
} | ||
], | ||
ignorePatterns: ['**/dist/**', '!.puppeteerrc.cjs'] | ||
overrides: [ | ||
{ | ||
files: ['*.ts', '*.tsx'], | ||
extends: ['@vizzu/eslint-config/typescript'], | ||
rules: { | ||
'no-use-before-define': 'off', | ||
'@typescript-eslint/no-use-before-define': 'error', | ||
'@typescript-eslint/explicit-function-return-type': ['error'] | ||
} | ||
}, | ||
{ | ||
files: ['*.js', '*.mjs', '*.cjs'], | ||
extends: ['@vizzu/eslint-config/standard'] | ||
}, | ||
{ | ||
files: ['test/e2e/test_cases/**', 'test/e2e/test_data/**'], | ||
extends: ['@vizzu/eslint-config/standard'], | ||
rules: { | ||
camelcase: 'off' | ||
} | ||
} | ||
], | ||
ignorePatterns: ['**/dist/**'] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
name: CD | ||
|
||
on: | ||
release: | ||
types: [published] | ||
release: | ||
types: [published] | ||
|
||
jobs: | ||
release: | ||
runs-on: ubuntu-22.04 | ||
publish: | ||
runs-on: ubuntu-22.04 | ||
|
||
steps: | ||
- name: Trigger Cloud Build | ||
run: | | ||
curl -X POST -H "Content-type: application/json" "https://cloudbuild.googleapis.com/v1/projects/vizzu-ci/triggers/vizzu-lib-release:webhook?key=${{ secrets.VIZZUHQ_GCP_BUILD }}" -d "{}" | ||
steps: | ||
- name: Trigger Cloud Build | ||
run: | | ||
curl -X POST -H "Content-type: application/json" "https://cloudbuild.googleapis.com/v1/projects/vizzu-ci/triggers/vizzu-lib-release:webhook?key=${{ secrets.VIZZUHQ_GCP_BUILD }}" -d "{}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,29 @@ | ||
name: Docker Build and Push vizzu-dev-desktop | ||
name: Docker publish vizzu-dev-desktop | ||
|
||
on: | ||
push: | ||
branches-ignore: | ||
- main | ||
paths: | ||
- '**/vizzu-dev-desktop' | ||
- '**/docker-vizzu-dev-desktop.yml' | ||
push: | ||
branches-ignore: | ||
- main | ||
paths: | ||
- '**/vizzu-dev-desktop' | ||
- '**/docker-vizzu-dev-desktop.yml' | ||
|
||
jobs: | ||
build-and-push: | ||
runs-on: ubuntu-22.04 | ||
publish: | ||
runs-on: ubuntu-22.04 | ||
|
||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v3 | ||
steps: | ||
- name: Checkout repo | ||
uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 1 | ||
|
||
- name: Login to Docker Hub | ||
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin | ||
- name: Login to Docker | ||
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin | ||
|
||
- name: Build and Push Docker Image | ||
run: | | ||
IMAGE="vizzu-dev-desktop" | ||
IMAGE_NAME="vizzu/$IMAGE:0.9" | ||
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE . | ||
docker push $IMAGE_NAME | ||
- name: Build and Publish | ||
run: | | ||
IMAGE="vizzu-dev-desktop" | ||
IMAGE_NAME="vizzu/$IMAGE:0.10" | ||
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE . | ||
docker push $IMAGE_NAME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,29 @@ | ||
name: Docker Build and Push vizzu-dev-wasm | ||
name: Docker publish vizzu-dev-wasm | ||
|
||
on: | ||
push: | ||
branches-ignore: | ||
- main | ||
paths: | ||
- '**/vizzu-dev-wasm' | ||
- '**/docker-vizzu-dev-wasm.yml' | ||
push: | ||
branches-ignore: | ||
- main | ||
paths: | ||
- '**/vizzu-dev-wasm' | ||
- '**/docker-vizzu-dev-wasm.yml' | ||
|
||
jobs: | ||
build-and-push: | ||
runs-on: ubuntu-22.04 | ||
publish: | ||
runs-on: ubuntu-22.04 | ||
|
||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v3 | ||
steps: | ||
- name: Checkout repo | ||
uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 1 | ||
|
||
- name: Login to Docker Hub | ||
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin | ||
- name: Login to Docker | ||
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin | ||
|
||
- name: Build and Push Docker Image | ||
run: | | ||
IMAGE="vizzu-dev-wasm" | ||
IMAGE_NAME="vizzu/$IMAGE:0.9" | ||
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE . | ||
docker push $IMAGE_NAME | ||
- name: Build and Publish | ||
run: | | ||
IMAGE="vizzu-dev-wasm" | ||
IMAGE_NAME="vizzu/$IMAGE:0.10" | ||
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE . | ||
docker push $IMAGE_NAME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
name: Notify on merged PR | ||
on: | ||
pull_request: | ||
types: | ||
- closed | ||
|
||
jobs: | ||
notify_merged_pr: | ||
name: Notify on merged PR | ||
runs-on: ubuntu-22.04 | ||
if: ${{ github.event.pull_request.merged == true }} | ||
steps: | ||
- uses: abinoda/slack-action@master | ||
env: | ||
SLACK_BOT_TOKEN: ${{ secrets.VIZZUHQ_SLACK_API }} | ||
with: | ||
args: '{\"channel\":\"${{ secrets.VIZZUHQ_SLACK_CHANNEL }}\",\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"*REPO:* vizzu-lib\n*PR:* ${{ github.event.pull_request.title }}\n*Description :* ${{ github.event.pull_request.body }}\n*Opened by :* ${{ github.event.pull_request.user.login }}\n*Merged at:* ${{ github.event.pull_request.merged_at }}\n<${{ github.event.pull_request.html_url }}|View PR>\"}}]}' | ||
if: success() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,9 @@ dist | |
.coverage | ||
test_report | ||
test_report.tgz | ||
*.ppt | ||
*.pptx | ||
*.ipynb | ||
|
||
__pycache__ | ||
|
||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
const { join } = require('path') | ||
|
||
module.exports = { | ||
cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer') | ||
cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer') | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.