Skip to content

Commit afb81a1

Browse files
back to single workflow as sonar cant do mono repo and dont have permissions to access the settings to set.
1 parent 3668adf commit afb81a1

File tree

12 files changed

+32
-8
lines changed

12 files changed

+32
-8
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

.github/workflows/stage-2-test.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,21 @@ jobs:
6868
uses: actions/checkout@v5
6969
- name: "Repo setup"
7070
run: |
71-
npm ci
71+
make config
72+
7273
- name: "Generate dependencies"
7374
run: |
7475
npm run generate-dependencies --workspaces --if-present
76+
7577
- name: "Run unit test suite"
7678
run: |
7779
make test-unit
80+
81+
- name: "Reports to correct location"
82+
run: |
83+
mkdir -p .reports
84+
TMPDIR="./.reports" ./node_modules/.bin/lcov-result-merger "**/.reports/unit/coverage/lcov.info" ".reports/lcov.info" --ignore "node_modules" --prepend-source-files --prepend-path-fix "../../.."
85+
7886
- name: "Save the result of fast test suite"
7987
uses: actions/upload-artifact@v4
8088
with:

docs/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ VERSION ?= ""
33
SCHEMA_PATTERN = *.schema.json
44
SCHEMA_DOCS_PATTERN = *.md
55
SCHEMA_YAML_DOCS_PATTERN= *.yaml
6-
SCHEMA_BASE_INPUT_DIR = ../src/cloudeventjekylldocs
7-
SCHEMA_SRC_BASE_DIR = ../src/cloudevents
6+
SRC_BASE_DIR = ../src
7+
SCHEMA_BASE_INPUT_DIR = $(SRC_BASE_DIR)/cloudeventjekylldocs
8+
SCHEMA_SRC_BASE_DIR = $(SRC_BASE_DIR)/cloudevents
89
SCHEMA_INPUT_DIR = $(SCHEMA_BASE_INPUT_DIR)/output/schemas
910
SCHEMA_DOCS_INPUT_DIR = $(SCHEMA_BASE_INPUT_DIR)/output/docs/md
1011
SCHEMA_YAML_DOCS_INPUT_DIR = $(SCHEMA_BASE_INPUT_DIR)/output/docs/yaml
@@ -15,8 +16,8 @@ SCHEMA_DOCS_OUTPUT_DIR = $(BASE_DOCS_OUTPUT_DIR)
1516
SCHEMA_YAML_DOCS_OUTPUT_DIR = _data/schema
1617
SHELL = /bin/bash
1718

18-
EVENT_CAT_ROOT_DIR = ../src/eventcatalog
19-
EVENT_CAT_INPUT_DIR = ../src/eventcatalog/dist
19+
EVENT_CAT_ROOT_DIR = $(SRC_BASE_DIR)/ventcatalog
20+
EVENT_CAT_INPUT_DIR = $(SRC_BASE_DIR)/eventcatalog/dist
2021
EVENT_CAT_OUTPUT_DIR = eventcatalog
2122

2223
BASE_URL_REMOVE_TRAILING_SLASH := $(patsubst %/,%,$(BASE_URL))
@@ -31,6 +32,7 @@ install:
3132
npm install
3233
bundle config set --local path vendor/bundle
3334
bundle install
35+
$(MAKE) -C $(SRC_BASE_DIR) install
3436

3537
s serve:
3638
npm run serve
@@ -40,7 +42,7 @@ $(if $(BASE_URL),-- --baseurl $(BASE_URL),-- --baseurl "")
4042
endef
4143

4244
test:
43-
$(MAKE) -C $(SCHEMA_SRC_BASE_DIR) test
45+
$(MAKE) -C $(SRC_BASE_DIR) test
4446

4547
build: clean build-schemas copy-schema-docs copy-schema-yaml-docs copy-schemas build-eventcatalog build-docs show-build-output
4648

scripts/tests/unit.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ cd "$(git rev-parse --show-toplevel)"
2222
npm ci
2323
npm run test:unit --workspaces
2424

25+
make -C docs test
26+
2527
# moved to make test in docs. Planning for separate deployment of docs
2628
# # Python projects - asyncapigenerator
2729
# echo "Setting up and running asyncapigenerator tests..."

0 commit comments

Comments
 (0)