Skip to content

Commit

Permalink
Merge branch 'hotfix/3.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
To-om committed Nov 10, 2021
2 parents 5259659 + 521817d commit e71bb16
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
10 changes: 9 additions & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ steps:
- name: run-tests
image: thehiveproject/drone-scala-node
commands:
- sbt -Duser.home=$PWD test:compile test
- |
. ~/.nvm/nvm.sh
nvm install 12.18
npm install -g bower
sbt -Duser.home=$PWD test:compile test Universal/packageBin
# Build packages
- name: build-packages
Expand All @@ -35,6 +39,8 @@ steps:
exit 1
fi
. ~/.nvm/nvm.sh
nvm install 12.18
npm install -g bower
[ -n "$PLUGIN_PGP_KEY" ] && gpg --batch --import - <<< $PLUGIN_PGP_KEY
sbt -Duser.home=$PWD Docker/stage Debian/packageBin Rpm/packageBin Universal/packageBin cortexWithDeps/Docker/stage
if ( echo $V | grep -qi rc )
Expand Down Expand Up @@ -121,6 +127,8 @@ steps:
image: thehiveproject/drone-scala-node
commands:
- sed -i -e 's/,/-withdeps,/g; s/$/-withdeps/' .tags
when:
event: [tag]

# Publish docker image on Docker Hub
- name: docker fat
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## [3.1.3](https://github.com/TheHive-Project/Cortex/milestone/31) (2021-11-10)

**Fixed bugs:**

- The build of frontend fails [\#389](https://github.com/TheHive-Project/Cortex/issues/389)

## [3.1.2](https://github.com/TheHive-Project/Cortex/milestone/30) (2021-11-05)

**Closed issues:**
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "3.1.2-1"
ThisBuild / version := "3.1.3-1"
2 changes: 1 addition & 1 deletion www/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cortex",
"version": "3.1.1",
"version": "3.1.3",
"description": "A powerfull observable analysis engine",
"license": "AGPL-3.0-or-later",
"homepage": "https://github.com/TheHive-Project/Cortex",
Expand Down

0 comments on commit e71bb16

Please sign in to comment.