Merge pull request #22 from eea/develop

Update version to 2.4
eea · Dec 4, 2020 · bb09baa · bb09baa
2 parents 297d504 + 4293f9c
commit bb09baa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -145,7 +145,7 @@ pipeline {
       steps {
         node(label: 'docker') {
           withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),[$class: 'UsernamePasswordMultiBinding', credentialsId: 'pypi-jenkins', usernameVariable: 'PYPI_USERNAME', passwordVariable: 'PYPI_PASSWORD']]) {
-            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME"  -e PYPI_USERNAME="$PYPI_USERNAME"  -e PYPI_PASSWORD="$PYPI_PASSWORD" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" -e GIT_HISTORYFILE=$GIT_HISTORYFILE eeacms/gitflow'''
+            sh '''docker pull eeacms/gitflow; docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME"  -e PYPI_USERNAME="$PYPI_USERNAME"  -e PYPI_PASSWORD="$PYPI_PASSWORD" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" -e GIT_HISTORYFILE=$GIT_HISTORYFILE eeacms/gitflow'''
           }
         }
       }

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-2.4-dev0 - (unreleased)
+2.4 - (2020-12-04)
 ---------------------------
 * add some privileges for NFPs on the user details page
   [valipod]

diff --git a/eea/userseditor/version.txt b/eea/userseditor/version.txt
@@ -1 +1 @@
-2.4-dev0
+2.4