Skip to content

Commit 4a95348

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/api/elliptic-6.6.1
2 parents 0b50f0c + f24db07 commit 4a95348

File tree

240 files changed

+11839
-4381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+11839
-4381
lines changed

.c8rc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.codeclimate.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 67 deletions
This file was deleted.

.github/workflows/main.yaml

Lines changed: 93 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,41 @@
11
name: ci
2-
on: [ push, workflow_dispatch ]
2+
on:
3+
push:
4+
workflow_dispatch:
5+
inputs:
6+
run_tests:
7+
description: "Run tests"
8+
default: false
9+
required: false
10+
type: boolean
11+
run_additional_tests:
12+
description: "Run additional tests"
13+
default: false
14+
required: false
15+
type: boolean
16+
build_e2e_tests:
17+
description: "Build end-to-end tests"
18+
default: false
19+
required: false
20+
type: boolean
21+
build_app:
22+
description: "Build app"
23+
default: false
24+
required: false
25+
type: boolean
26+
build_docs:
27+
description: "Build docs"
28+
default: false
29+
required: false
30+
type: boolean
331

432
jobs:
533
run_tests:
634
name: Run tests
7-
if: ${{ !contains(github.event.head_commit.message, 'skip tests') }}
35+
if: ${{
36+
github.event_name == 'workflow_dispatch' && inputs.run_tests ||
37+
github.event_name == 'push' && !contains(github.event.head_commit.message, 'skip tests')
38+
}}
839
runs-on: ubuntu-22.04
940
steps:
1041
- name: Checkout repo
@@ -20,11 +51,65 @@ jobs:
2051
- name: Run tests
2152
env:
2253
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
23-
run: bash ./scripts/run_tests.sh -c -r ${{ github.job }}
54+
run: bash ./scripts/run_tests.sh -s -r ${{ github.job }}
55+
56+
additional_tests:
57+
strategy:
58+
fail-fast: false
59+
matrix:
60+
node: [20, 22]
61+
mongo: [7, 8]
62+
name: Additional tests
63+
if: ${{
64+
github.event_name == 'workflow_dispatch' && inputs.run_additional_tests ||
65+
github.event_name == 'push' && contains(github.event.head_commit.message, 'additional tests')
66+
}}
67+
runs-on: ubuntu-22.04
68+
steps:
69+
- name: Checkout repo
70+
uses: actions/checkout@v4
71+
with:
72+
submodules: true
73+
- name: Init runner
74+
run: bash ./scripts/init_runner.sh ${{ github.job }}
75+
- name: Setup workspace
76+
env:
77+
KALISIO_GITHUB_URL: ${{ secrets.KALISIO_GITHUB_URL }}
78+
run: bash ./scripts/setup_workspace.sh -k klifull -n ${{ matrix.node }}
79+
- name: Run tests
80+
env:
81+
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
82+
run: bash ./scripts/run_tests.sh -n ${{ matrix.node }} -m ${{ matrix.mongo }}
83+
84+
build_e2e_tests:
85+
name: Build e2e tests
86+
if: ${{
87+
github.event_name == 'workflow_dispatch' && inputs.build_e2e_tests ||
88+
github.event_name == 'push' && contains(github.event.head_commit.message, 'e2e')
89+
}}
90+
runs-on: ubuntu-22.04
91+
steps:
92+
- name: Checkout repo
93+
uses: actions/checkout@v4
94+
with:
95+
submodules: true
96+
- name: Init runner
97+
run: bash ./scripts/init_runner.sh ${{ github.job }}
98+
- name: Setup workspace
99+
env:
100+
KALISIO_GITHUB_URL: ${{ secrets.KALISIO_GITHUB_URL }}
101+
run: bash ./scripts/setup_workspace.sh -k kli
102+
- name: Build e2e tests
103+
env:
104+
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
105+
run: bash ./scripts/build_e2e_tests.sh -p -r ${{ github.job }}
24106

25107
build_app:
26108
name: Build app
27-
if: ${{ !contains(github.event.head_commit.message, 'skip app') }}
109+
if: ${{
110+
github.event_name == 'workflow_dispatch' && inputs.build_app ||
111+
github.event_name == 'push' && !contains(github.event.head_commit.message, 'skip app')
112+
}}
28113
runs-on: ubuntu-22.04
29114
strategy:
30115
fail-fast: false
@@ -49,7 +134,10 @@ jobs:
49134

50135
build_docs:
51136
name: Build docs
52-
if: ${{ startsWith(github.event.head_commit.message, 'docs:') || contains(github.event.head_commit.message, 'build doc') }}
137+
if: ${{
138+
github.event_name == 'workflow_dispatch' && inputs.build_docs ||
139+
github.event_name == 'push' && contains(github.event.head_commit.message, 'doc')
140+
}}
53141
runs-on: ubuntu-22.04
54142
steps:
55143
- name: Checkout repo

.gitignore

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
*.njsproj
77
*.sln
88

9+
# Local configurations
10+
local.cjs
11+
912
# Quasar build
1013
.quasar
1114

@@ -78,11 +81,12 @@ test/run
7881
public/Cesium
7982

8083
# KDK extras
81-
public/icons/kdk
82-
public/kalisio.png
83-
src/tours/core
84-
src/tours/map
84+
config/kdk
85+
public/kdk
86+
src/assets/kdk
87+
src/tours/kdk
8588
src/css/kdk
89+
test/kdk
8690

8791
# local layers
8892
local-layers.js

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
[![Latest Release](https://img.shields.io/github/v/tag/kalisio/kano?sort=semver&label=latest)](https://github.com/kalisio/kano/releases)
66
[![Build Status](https://app.travis-ci.com/kalisio/kano.svg?branch=master)](https://app.travis-ci.com/kalisio/kano)
7-
[![Code Climate](https://codeclimate.com/github/kalisio/kano/badges/gpa.svg)](https://codeclimate.com/github/kalisio/kano)
8-
[![Test Coverage](https://codeclimate.com/github/kalisio/kano/badges/coverage.svg)](https://codeclimate.com/github/kalisio/kano/coverage)
7+
[![Quality Gate Status](https://sonar.portal.kalisio.com/api/project_badges/measure?project=kalisio-kano&metric=alert_status&token=sqb_a4fd6b20cd67bf0553c3c1b5c5ffa316f4aab0d2)](https://sonar.portal.kalisio.com/dashboard?id=kalisio-kano)
8+
[![Maintainability Issues](https://sonar.portal.kalisio.com/api/project_badges/measure?project=kalisio-kano&metric=software_quality_maintainability_issues&token=sqb_a4fd6b20cd67bf0553c3c1b5c5ffa316f4aab0d2)](https://sonar.portal.kalisio.com/dashboard?id=kalisio-kano)
9+
[![Coverage](https://sonar.portal.kalisio.com/api/project_badges/measure?project=kalisio-kano&metric=coverage&token=sqb_a4fd6b20cd67bf0553c3c1b5c5ffa316f4aab0d2)](https://sonar.portal.kalisio.com/dashboard?id=kalisio-kano)
910
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
1011
[![Documentation](https://img.shields.io/badge/documentation-available-brightgreen.svg)](https://kalisio.github.io/kano/)
1112
[![Docker Pulls](https://img.shields.io/docker/pulls/kalisio/kano.svg)](https://hub.docker.com/r/kalisio/kano/)

api/.c8rc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"all": true,
3+
"include": ["src/**/*.js"],
4+
"reporter": ["text", "lcovonly"]
5+
}

api/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,5 @@ typings/
6060
# Distribution files
6161
dist
6262

63+
# Automerge data
64+
automerge

0 commit comments

Comments
 (0)