Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.8.0 #146

Merged
merged 11 commits into from
May 17, 2021
Merged

Release/2.8.0 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
08d3193
Update images for core and hmi
crokita Apr 15, 2021
306932e
Remove vulnerabilities
crokita Apr 21, 2021
6ff3bd4
Merge pull request #141 from smartdevicelink/2.8.0-vulnerabilities
crokita Apr 22, 2021
f5527c9
Update core image version
crokita May 6, 2021
fbda8d5
Merge branch 'release/2.8.0' of https://github.com/smartdevicelink/ma…
crokita May 6, 2021
a06915a
Bump lodash from 4.17.20 to 4.17.21
dependabot[bot] May 7, 2021
3d5187a
Merge pull request #142 from smartdevicelink/dependabot/npm_and_yarn/…
crokita May 12, 2021
dabc636
Update koa-router
crokita May 12, 2021
f9b9b9e
Update version to 2.8.0
crokita May 12, 2021
fa9c0e3
Merge branch 'release/2.8.0' of https://github.com/smartdevicelink/ma…
crokita May 12, 2021
76e5f0e
Merge pull request #145 from smartdevicelink/bugfix/2.8.0-vulnerabili…
crokita May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api/v2/app/interfaces/job/manticore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ const HMI_HEALTH_TIME = 8000;

const jobInfo = {
core: {
versions: ["7.0.0"], //ex. 5.0.1, master, develop
versions: ["7.1.1"], //ex. 5.0.1, master, develop
builds: ["default"]
},
hmis: [{
type: "generic",
versions: ["minimal-0.9.0"] //ex. master, minimal-0.5.1
versions: ["minimal-0.10.0"] //ex. master, minimal-0.5.1
}]
};

Expand Down Expand Up @@ -313,12 +313,12 @@ function formatAddresses (id, services) {
function exampleJobOption () {
return {
core: {
version: "7.0.0",
version: "7.1.1",
build: "default"
},
hmi: {
type: "generic",
version: "minimal-0.9.0"
version: "minimal-0.10.0"
}
};
}
Expand Down
125 changes: 56 additions & 69 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "manticore",
"version": "2.7.0",
"version": "2.8.0",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -11,7 +11,7 @@
"license": "ISC",
"dependencies": {
"aws-sdk": "^2.319.0",
"axios": "^0.19.0",
"axios": "^0.21.1",
"check-types": "^7.4.0",
"consul": "^0.33.1",
"dotenv": "^6.0.0",
Expand All @@ -20,7 +20,7 @@
"koa-compose": "^4.1.0",
"koa-cors": "0.0.16",
"koa-jwt": "^3.3.2",
"koa-router": "^7.4.0",
"koa-router": "^10.0.0",
"koa-static": "^5.0.0",
"koa-websocket": "^5.0.1",
"nomad-helper": "^3.6.1",
Expand Down