Skip to content

Commit 38219fb

Browse files
authored
Merge branch 'stoplightio:master' into master
2 parents 5d72862 + d7b6ce3 commit 38219fb

File tree

8 files changed

+150
-9
lines changed

8 files changed

+150
-9
lines changed

.github/workflows/build.yml

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
name: stoplightio/prism/build
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
container:
10+
image: node:18.20
11+
steps:
12+
- uses: actions/[email protected]
13+
- name: restore_cache
14+
uses: actions/[email protected]
15+
with:
16+
key: yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
17+
path: node_modules/
18+
restore-keys: yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
19+
- name: Install Dependencies
20+
run: yarn --frozen-lockfile
21+
- name: Lint the codebase
22+
run: yarn lint
23+
- name: Run tests
24+
run: yarn test --colors --maxWorkers=2
25+
- name: Run build
26+
run: yarn build
27+
harness-macos:
28+
if: (github.ref == 'refs/tags/"v[0-9].[0-9]+.[0-9]+"') && (github.ref != 'refs/heads/master')
29+
runs-on: macos-latest
30+
env:
31+
executor: macos
32+
install_manually: true
33+
steps:
34+
- uses: maxim-lobanov/[email protected]
35+
with:
36+
xcode-version: 13.4.1
37+
- uses: actions/[email protected]
38+
- run: nvm install 18.20.1 && nvm alias default 18.20.1
39+
if: env.install_manually
40+
- run: pip3 install pipenv gunicorn
41+
if: env.install_manually
42+
- run: sudo bash -c 'echo "0.0.0.0 httpbin.org" >> /etc/hosts'
43+
if: env.install_manually
44+
- run: git clone https://github.com/stoplightio/httpbin httpbin
45+
if: env.install_manually
46+
- run: cd httpbin && pip3 install --no-cache-dir -r <(pipenv requirements) && pip3 install --no-cache-dir ./
47+
if: env.install_manually
48+
- run: cd httpbin && gunicorn -b 0.0.0.0:80 httpbin:app -k gevent
49+
if: env.install_manually
50+
- name: Install Dependencies
51+
run: yarn --frozen-lockfile
52+
- name: Create CLI binary
53+
run: yarn build.binary
54+
- name: Run Harness
55+
run: yarn test.harness
56+
harness-docker:
57+
runs-on: ubuntu-latest
58+
container:
59+
image: node:18.20
60+
env:
61+
executor: docker-harness
62+
install_manually: true
63+
steps:
64+
- uses: actions/[email protected]
65+
- run: nvm install 18.20.1 && nvm alias default 18.20.1
66+
if: env.install_manually
67+
- run: pip3 install pipenv gunicorn
68+
if: env.install_manually
69+
- run: sudo bash -c 'echo "0.0.0.0 httpbin.org" >> /etc/hosts'
70+
if: env.install_manually
71+
- run: git clone REDACTED://github.com/stoplightio/httpbin httpbin
72+
if: env.install_manually
73+
- run: cd httpbin && pip3 install --no-cache-dir -r <(pipenv requirements) && pip3 install --no-cache-dir ./
74+
if: env.install_manually
75+
- run: cd httpbin && gunicorn -b 0.0.0.0:80 httpbin:app -k gevent
76+
if: env.install_manually
77+
- name: Install Dependencies
78+
run: yarn --frozen-lockfile
79+
- name: Create CLI binary
80+
run: yarn build.binary
81+
- name: Run Harness
82+
run: yarn test.harness
83+
publish:
84+
if: (github.ref == 'refs/tags/"v[0-9].[0-9]+.[0-9]+"') && (github.ref != 'refs/heads/master')
85+
runs-on: ubuntu-latest
86+
container:
87+
image: node:18.20
88+
needs:
89+
- build
90+
- harness-macos
91+
- harness-docker
92+
steps:
93+
- uses: actions/[email protected]
94+
- name: Set git identity
95+
run: git config user.email "[email protected]" && git config user.name "circleci"
96+
- name: Install Dependencies
97+
run: yarn --frozen-lockfile
98+
- name: Build all code to JavaScript
99+
run: yarn build
100+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
101+
- name: Publish
102+
run: yarn lerna publish from-git --create-release=github --yes
103+
- name: Create CLI binaries
104+
run: npx pkg --out-path ./cli-binaries ./packages/cli/
105+
- uses: actions/[email protected]
106+
with:
107+
path: "./cli-binaries"
108+
- uses: actions/[email protected]
109+
with:
110+
path: ".//cli-binaries"
111+
upload_artifacts:
112+
if: (github.ref == 'refs/tags/"v[0-9].[0-9]+.[0-9]+"') && (github.ref != 'refs/heads/master')
113+
runs-on: ubuntu-latest
114+
container:
115+
image: golang:1.23
116+
needs:
117+
- publish
118+
steps:
119+
- uses: actions/[email protected]
120+
with:
121+
path: "/tmp/"
122+
- name: Download GitHub Release Utility
123+
run: go install github.com/tcnksm/ghr@latest
124+
- name: Publish Release artifacts on GitHub
125+
run: ghr -t ${{github.token}} -u ${{ github.actor }} -r ${{ github.repository }} -c ${{ github.sha }} ${{ github.ref }} /tmp/cli-binaries

.release-please-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
".": "5.14.2",
3-
"packages/cli": "5.14.2",
2+
".": "5.14.3",
3+
"packages/cli": "5.14.3",
44
"packages/core": "5.8.0",
55
"packages/http": "5.12.1",
6-
"packages/http-server": "5.12.2"
7-
}
6+
"packages/http-server": "5.13.0"
7+
}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ The format for this file is based on [Keep a Changelog](https://keepachangelog.c
1616

1717
<!-- markdown-link-check-disable -->
1818

19+
## [5.14.3](https://github.com/stoplightio/prism/compare/v5.14.2...v5.14.3) (2025-10-27)
20+
21+
22+
### Bug Fixes
23+
24+
* Fix vulnerability CVE-2025-1302 ([#2702](https://github.com/stoplightio/prism/issues/2702)) ([fdc55de](https://github.com/stoplightio/prism/commit/fdc55de8742ac1f47ac32a69700406a71774cd29))
25+
1926
## [5.14.2](https://github.com/stoplightio/prism/compare/v5.14.1...v5.14.2) (2025-04-17)
2027

2128

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"resolutions": {
2525
"sanitize-html": "2.12.1",
26-
"jsonpath-plus":"10.2.0"
26+
"jsonpath-plus": "10.3.0"
2727
},
2828
"devDependencies": {
2929
"@stoplight/types": "^14.1.0",

packages/cli/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [5.14.3](https://github.com/stoplightio/prism/compare/v5.14.2...v5.14.3) (2025-10-27)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* dependencies
10+
* @stoplight/prism-http-server bumped from ^5.12.0 to ^5.13.0
11+
312
## [5.14.2](https://github.com/stoplightio/prism/compare/v5.14.1...v5.14.2) (2025-04-17)
413

514

packages/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@stoplight/prism-cli",
3-
"version": "5.14.2",
3+
"version": "5.14.3",
44
"author": "Stoplight <[email protected]>",
55
"bin": {
66
"prism": "./dist/index.js"
@@ -11,7 +11,7 @@
1111
"@stoplight/json-schema-ref-parser": "9.2.7",
1212
"@stoplight/prism-core": "^5.8.0",
1313
"@stoplight/prism-http": "5.12.0",
14-
"@stoplight/prism-http-server": "^5.12.0",
14+
"@stoplight/prism-http-server": "^5.13.0",
1515
"@stoplight/types": "^14.1.0",
1616
"chalk": "^4.1.2",
1717
"chokidar": "^3.5.2",

packages/http-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@stoplight/prism-http-server",
3-
"version": "5.12.2",
3+
"version": "5.13.0",
44
"main": "dist/index.js",
55
"types": "dist/index.d.ts",
66
"author": "Stoplight <[email protected]>",

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.14.2
1+
5.14.3

0 commit comments

Comments
 (0)