From c46cb6fa12db79ac34e848b278d1bc6f5e3f34a1 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 10 Nov 2021 10:39:58 +0100 Subject: [PATCH 1/4] #389 Set correct version of npm --- .drone.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9f69f743d..315c887db 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,10 @@ steps: - name: run-tests image: thehiveproject/drone-scala-node commands: - - sbt -Duser.home=$PWD test:compile test + - | + . ~/.nvm/nvm.sh + nvm install 12.18 + sbt -Duser.home=$PWD test:compile test # Build packages - name: build-packages @@ -35,6 +38,7 @@ steps: exit 1 fi . ~/.nvm/nvm.sh + nvm install 12.18 [ -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 ) From dd81737a0e06f027dc44832611ad1894c785b48d Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 10 Nov 2021 10:45:08 +0100 Subject: [PATCH 2/4] Release 3.1.3 --- CHANGELOG.md | 6 ++++++ version.sbt | 2 +- www/package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb2de93de..4dee82011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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:** diff --git a/version.sbt b/version.sbt index 646259b53..32aafa8c1 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "3.1.2-1" +ThisBuild / version := "3.1.3-1" diff --git a/www/package.json b/www/package.json index aa1af9fa8..b5f7eea54 100755 --- a/www/package.json +++ b/www/package.json @@ -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", From b5f11763d1686d171f319838d0e4ee4302aada45 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 10 Nov 2021 11:49:37 +0100 Subject: [PATCH 3/4] Fix CI --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 315c887db..98d65843e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: - | . ~/.nvm/nvm.sh nvm install 12.18 - sbt -Duser.home=$PWD test:compile test + sbt -Duser.home=$PWD test:compile test Universal/packageBin # Build packages - name: build-packages @@ -125,6 +125,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 From 521817d6d5ac649a53b94ca634276d7cdd3eb5ed Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 10 Nov 2021 12:00:31 +0100 Subject: [PATCH 4/4] Install bower to build frontend --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 98d65843e..10c087381 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,6 +23,7 @@ steps: - | . ~/.nvm/nvm.sh nvm install 12.18 + npm install -g bower sbt -Duser.home=$PWD test:compile test Universal/packageBin # Build packages @@ -39,6 +40,7 @@ steps: 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 )