Skip to content

Commit e71bb16

Browse files
committed
Merge branch 'hotfix/3.1.3'
2 parents 5259659 + 521817d commit e71bb16

4 files changed

Lines changed: 17 additions & 3 deletions

File tree

.drone.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ steps:
2020
- name: run-tests
2121
image: thehiveproject/drone-scala-node
2222
commands:
23-
- sbt -Duser.home=$PWD test:compile test
23+
- |
24+
. ~/.nvm/nvm.sh
25+
nvm install 12.18
26+
npm install -g bower
27+
sbt -Duser.home=$PWD test:compile test Universal/packageBin
2428
2529
# Build packages
2630
- name: build-packages
@@ -35,6 +39,8 @@ steps:
3539
exit 1
3640
fi
3741
. ~/.nvm/nvm.sh
42+
nvm install 12.18
43+
npm install -g bower
3844
[ -n "$PLUGIN_PGP_KEY" ] && gpg --batch --import - <<< $PLUGIN_PGP_KEY
3945
sbt -Duser.home=$PWD Docker/stage Debian/packageBin Rpm/packageBin Universal/packageBin cortexWithDeps/Docker/stage
4046
if ( echo $V | grep -qi rc )
@@ -121,6 +127,8 @@ steps:
121127
image: thehiveproject/drone-scala-node
122128
commands:
123129
- sed -i -e 's/,/-withdeps,/g; s/$/-withdeps/' .tags
130+
when:
131+
event: [tag]
124132

125133
# Publish docker image on Docker Hub
126134
- name: docker fat

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## [3.1.3](https://github.com/TheHive-Project/Cortex/milestone/31) (2021-11-10)
4+
5+
**Fixed bugs:**
6+
7+
- The build of frontend fails [\#389](https://github.com/TheHive-Project/Cortex/issues/389)
8+
39
## [3.1.2](https://github.com/TheHive-Project/Cortex/milestone/30) (2021-11-05)
410

511
**Closed issues:**

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ThisBuild / version := "3.1.2-1"
1+
ThisBuild / version := "3.1.3-1"

www/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cortex",
3-
"version": "3.1.1",
3+
"version": "3.1.3",
44
"description": "A powerfull observable analysis engine",
55
"license": "AGPL-3.0-or-later",
66
"homepage": "https://github.com/TheHive-Project/Cortex",

0 commit comments

Comments
 (0)