From 3f14fecde730c1c81d045d6a398ea2271591593f Mon Sep 17 00:00:00 2001
From: Edward Oliveira <edwardr@senado.gov.br>
Date: Wed, 28 Jun 2023 18:36:33 -0700
Subject: [PATCH] HOT-FIX: conserta changelog

---
 docker/docker-compose.yaml |  2 +-
 release.sh                 | 13 +++++++++----
 sapl/settings.py           |  2 +-
 sapl/templates/base.html   |  2 +-
 setup.py                   |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 8e14b5c9e..08c85bdbc 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -32,7 +32,7 @@ services:
     networks:
       - sapl-net
   sapl:
-    image: interlegis/sapl:3.1.163-RC13
+    image: interlegis/sapl:3.1.163-RC14
 #    build:
 #      context: ../
 #      dockerfile: ./docker/Dockerfile
diff --git a/release.sh b/release.sh
index be10e03f2..fa901eb25 100755
--- a/release.sh
+++ b/release.sh
@@ -20,7 +20,7 @@ green_color='\033[0;32m'
 red_color='\033[0;31m'
 reset_color='\033[0m'
 
-LATEST_VERSION=$(git tag | egrep $VERSION_PATTERN | sort --version-sort | tail -1)
+LATEST_VERSION=$(git tag | egrep $VERSION_PATTERN | sort --version-sort -r | head -1)
 MAJOR_VERSION=$(echo $LATEST_VERSION | cut -d"-" -f1)
 MAJOR_TAG_CREATED=$(git tag | egrep $MAJOR_VERSION"$")
 
@@ -51,6 +51,7 @@ function change_files {
     sed -E -i "" "s|$OLD_VERSION|$FINAL_VERSION|g" sapl/templates/base.html
 
     sed -E -i "" "s|$OLD_VERSION|$FINAL_VERSION|g" sapl/settings.py
+    
 }
 
 function set_major_version {
@@ -91,8 +92,12 @@ prompt_yes_no() {
 
 function commit_and_push {
    echo -e "${green_color}Committing new release $FINAL_VERSION...${color_reset}"
-   git changelog --tag $FINAL_VERSION -x >> CHANGES.md
-   git add docker/docker-compose.yaml setup.py sapl/settings.py sapl/templates/base.html CHANGES.md
+   git add docker/docker-compose.yaml setup.py sapl/settings.py sapl/templates/base.html
+   git changelog --tag $FINAL_VERSION --prune-old -x > latest_changes.tmp
+   cat /tmp/latest_changes.md CHANGES.md > CHANGES.tmp
+   mv CHANGES.tmp CHANGES.md
+   git add CHANGES.md
+   rm latest_changes.tmp
 
    if prompt_yes_no "${green_color}Do you want to commit SAPL $FINAL_VERSION release locally?${reset_color}"; then
        git commit -m "Release: $FINAL_VERSION"
@@ -144,7 +149,7 @@ case "$1" in
        exit 0
       ;;
     --top)
-       git tag | sort --version-sort | tail "-$2"
+       git tag | sort --version-sort -r | head "-$2"
        exit 0
        ;;
 
diff --git a/sapl/settings.py b/sapl/settings.py
index 10ebf5e28..34b9b1848 100644
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -41,7 +41,7 @@
 LOGIN_REDIRECT_URL = '/'
 LOGIN_URL = '/login/?next='
 
-SAPL_VERSION = '3.1.163-RC13'
+SAPL_VERSION = '3.1.163-RC14'
 
 if DEBUG:
     EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index cd56e0e52..d15523313 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -194,7 +194,7 @@ <h1 class="page-header">
                 <small>
                   Desenvolvido pelo <a href="http://www.interlegis.leg.br/">Interlegis</a> em software livre e aberto.
                 </small>
-		<span>Release: 3.1.163-RC13</span>
+		<span>Release: 3.1.163-RC14</span>
               </p>
 
             </div>
diff --git a/setup.py b/setup.py
index 5fd1b6d88..defc83b89 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
 ]
 setup(
     name='interlegis-sapl',
-    version='3.1.163-RC13',
+    version='3.1.163-RC14',
     packages=find_packages(),
     include_package_data=True,
     license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007',