Skip to content

Commit d3789e6

Browse files
authored
Merge branch 'main' into fix/examples-value-ref-resolution
2 parents e8a7d92 + d39585e commit d3789e6

File tree

1,054 files changed

+316
-267
lines changed

Some content is hidden

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

1,054 files changed

+316
-267
lines changed

.changeset/violet-jobs-doubt.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@redocly/cli": patch
3+
---
4+
5+
Fixed an issue where the `mount-path` option was not validated, leading to errors when used with an empty path or a path identical to the project path.

.github/workflows/performance.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- run: redocly-next --version
3737
- run: redocly --version
3838
- name: Run Benchmark
39-
run: hyperfine -i --warmup 3 'redocly lint packages/core/src/benchmark/benches/rebilly.yaml' 'redocly-next lint packages/core/src/benchmark/benches/rebilly.yaml' --export-markdown benchmark_check.md --export-json benchmark_check.json
39+
run: hyperfine -i --warmup 3 'redocly lint resources/rebilly.yaml' 'redocly-next lint resources/rebilly.yaml' --export-markdown benchmark_check.md --export-json benchmark_check.json
4040

4141
- name: Comment PR
4242
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
@@ -63,12 +63,12 @@ jobs:
6363
run: |
6464
npm run compile
6565
npm run pack:prepare
66-
cd benchmark/
66+
cd tests/performance/
6767
npm i
6868
npm run make-test
6969
- name: Run Benchmark
7070
run: |
71-
cd benchmark/
71+
cd tests/performance/
7272
npm test # This command is generated and injected into package.json in the previous step.
7373
cat benchmark_check.md
7474
npm run chart # Creates benchmark_chart.md with the performance bar chart.
@@ -77,5 +77,5 @@ jobs:
7777
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
7878
uses: thollander/actions-comment-pull-request@v2
7979
with:
80-
filePath: benchmark/benchmark_chart.md
80+
filePath: tests/performance/benchmark_chart.md
8181
comment_tag: historical-versions-comparison

.github/workflows/smoke-plugins.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
- name: Install dependencies
2424
run: npm ci
2525
- name: Prepare Smoke
26-
run: bash ./__tests__/smoke-plugins/prepare-smoke-plugins.sh
26+
run: bash ./tests/smoke/plugins/prepare-smoke-plugins.sh
2727
- uses: actions/cache@v3
2828
with:
29-
path: __tests__/smoke-plugins/
29+
path: tests/smoke/plugins/
3030
key: cache-plugins-${{ github.run_id }}-${{ github.run_attempt }}
3131

3232
run-smoke-plugins--npm--node-24:
@@ -35,77 +35,77 @@ jobs:
3535
steps:
3636
- uses: actions/cache@v3
3737
with:
38-
path: __tests__/smoke-plugins/
38+
path: tests/smoke/plugins/
3939
key: cache-plugins-${{ github.run_id }}-${{ github.run_attempt }}
4040
- uses: actions/setup-node@v3
4141
with:
4242
node-version: 24
43-
- run: bash ./__tests__/smoke-plugins/run-smoke.sh
43+
- run: bash ./tests/smoke/plugins/run-smoke.sh
4444

4545
run-smoke-plugins--npm--node-24--windows:
4646
needs: prepare-smoke-plugins
4747
runs-on: windows-latest
4848
steps:
4949
- uses: actions/cache@v3
5050
with:
51-
path: __tests__/smoke-plugins/
51+
path: tests/smoke/plugins/
5252
key: cache-plugins-${{ github.run_id }}-${{ github.run_attempt }}
5353
enableCrossOsArchive: true
5454
- uses: actions/setup-node@v3
5555
with:
5656
node-version: 24
57-
- run: bash ./__tests__/smoke-plugins/run-smoke.sh
57+
- run: bash ./tests/smoke/plugins/run-smoke.sh
5858

5959
run-smoke-plugins--npm--node-22:
6060
needs: prepare-smoke-plugins
6161
runs-on: ubuntu-latest
6262
steps:
6363
- uses: actions/cache@v3
6464
with:
65-
path: __tests__/smoke-plugins/
65+
path: tests/smoke/plugins/
6666
key: cache-plugins-${{ github.run_id }}-${{ github.run_attempt }}
6767
- uses: actions/setup-node@v3
6868
with:
6969
node-version: 22
70-
- run: bash ./__tests__/smoke-plugins/run-smoke.sh
70+
- run: bash ./tests/smoke/plugins/run-smoke.sh
7171

7272
run-smoke-plugins--npm--node-22--windows:
7373
needs: prepare-smoke-plugins
7474
runs-on: windows-latest
7575
steps:
7676
- uses: actions/cache@v3
7777
with:
78-
path: __tests__/smoke-plugins/
78+
path: tests/smoke/plugins/
7979
key: cache-plugins-${{ github.run_id }}-${{ github.run_attempt }}
8080
enableCrossOsArchive: true
8181
- uses: actions/setup-node@v3
8282
with:
8383
node-version: 22
84-
- run: bash ./__tests__/smoke-plugins/run-smoke.sh
84+
- run: bash ./tests/smoke/plugins/run-smoke.sh
8585

8686
run-smoke-plugins--npm--node-20:
8787
needs: prepare-smoke-plugins
8888
runs-on: ubuntu-latest
8989
steps:
9090
- uses: actions/cache@v3
9191
with:
92-
path: __tests__/smoke-plugins/
92+
path: tests/smoke/plugins/
9393
key: cache-plugins-${{ github.run_id }}-${{ github.run_attempt }}
9494
- uses: actions/setup-node@v3
9595
with:
9696
node-version: 20
97-
- run: bash ./__tests__/smoke-plugins/run-smoke.sh
97+
- run: bash ./tests/smoke/plugins/run-smoke.sh
9898

9999
run-smoke-plugins--npm--node-20--windows:
100100
needs: prepare-smoke-plugins
101101
runs-on: windows-latest
102102
steps:
103103
- uses: actions/cache@v3
104104
with:
105-
path: __tests__/smoke-plugins/
105+
path: tests/smoke/plugins/
106106
key: cache-plugins-${{ github.run_id }}-${{ github.run_attempt }}
107107
enableCrossOsArchive: true
108108
- uses: actions/setup-node@v3
109109
with:
110110
node-version: 20
111-
- run: bash ./__tests__/smoke-plugins/run-smoke.sh
111+
- run: bash ./tests/smoke/plugins/run-smoke.sh

0 commit comments

Comments
 (0)