Merge branch 'dry-run-release' into 'main'

Dry run release

See merge request reportcreator/reportcreator!677

.gitlab-ci.yml

@@ -200,6 +200,7 @@ release-gitlab-release:
   release:
     tag_name: "$CI_COMMIT_TAG"
     description: "$CI_COMMIT_TAG"
+
 
 release-prod:
   stage: release
@@ -267,7 +268,7 @@ release-prod:
         -X POST \
         -H "Authorization: Bearer ${SAASPANEL_API_TOKEN}" \
         -H "Content-Type: application/json" \
-        -d "{\"title\": \"🎊 Update available\", \"text\": \"There's a new SysReptor version (v${VERSION_NUMBER}) waiting for you.\", \"link_url\": \"https://github.com/Syslifters/sysreptor/releases/tag/${VERSION_NUMBER}\", \"instance_conditions\": {\"version\": \"<${VERSION_NUMBER}\"} }"
+        -d "{\"title\": \"🎊 Update available\", \"text\": \"There's a new SysReptor version (v${VERSION_NUMBER}) waiting for you.\", \"active_until\": \"$(date -d "yesterday" +%Y-%m-%d)\", \"link_url\": \"https://github.com/Syslifters/sysreptor/releases/tag/${VERSION_NUMBER}\", \"instance_conditions\": {\"version\": \"<${VERSION_NUMBER}\"} }"
 
 release-docs:
   stage: release

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Next
+## v2024.68 - 2024-08-29
 * Rework field definition data format. Warning: breaking API changes
 * Allow custom order of object field properties
 * Allow sorting combobox suggestions

docs/docs/install.sh

@@ -57,8 +57,8 @@ then
     exit -4
 fi
 
-download_url=https://github.com/syslifters/sysreptor/releases/latest/download/setup.tar.gz
-echo "Downloading Docker Compose files from $download_url ..."
+download_url=https://github.com/syslifters/sysreptor/releases/latest/download/source-prebuilt.tar.gz
+echo "Downloading SysReptor from $download_url ..."
 curl -s -L --output sysreptor.tar.gz "$download_url"
 echo "Checking download..."
 if
@@ -100,6 +100,10 @@ else
         fi
     done
 
+    # Delete docker-compose.override.yml because that's needed for existing PRO installations only due to legacy reasons
+    # ...not for new installations
+    rm docker-compose.override.yml 2>/dev/null || true
+
     echo "Creating app.env..."
     cp app.env.example app.env
 
@@ -139,30 +143,24 @@ then
     source caddy/setup.sh || true  # do not exit on error
 fi
 
-# Delete docker-compose.override.yml because that's needed for existing PRO installations only due to legacy reasons
-# ...not for new installations
-rm docker-compose.override.yml 2>/dev/null || true
-
 echo "Creating docker volumes..."
 echo -n "Volume: "
 docker volume create sysreptor-db-data
 echo -n "Volume: "
 docker volume create sysreptor-app-data
 
-echo "Launching SysReptor via docker compose..."
-echo "Downloading the Docker images may take a few minutes."
+echo "Build and launch SysReptor via docker compose..."
+echo "We are downloading and installing all dependencies."
+echo "This may take a few minutes."
 
 if
-    source .env
-    export SYSREPTOR_VERSION
     ! docker compose up -d
 then
     echo "Ups. Something did not work while bringing up your containers."
     exit -2
 fi
 
-echo ""
-echo "Waiting for database setup..."
+echo "Running migrations..."
 while
     sleep 1
     ! echo '' | docker compose exec --no-TTY app python3 manage.py migrate --check 1>/dev/null 2>&1
@@ -208,7 +206,7 @@ do
     read -p "Copy your password now. Copied? [y/n]: " CONFIRM
     if [[ $CONFIRM == [nN] ]]
     then
-        echo "It's a good password. You will like it."
+        echo "C'mon. Copy it. It's a good password."
     fi
 done