From 498bcbfc9e5d1af80035ffc5e1a0a8942cc3d444 Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Wed, 1 Sep 2021 18:34:35 +0200
Subject: [PATCH] Cleanup. Renamed releeases.json to releases-v3.json. Changed
 upload path. Added changelog link to release description

---
 .gitlab-ci.yml | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4c2b667a..5b98a34f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
   - build
   - test
   - upload-builds
-  # - release
+  - release
   - publish-windows
   - upload-windows-updater-release
 
@@ -43,16 +43,16 @@ upload-builds:
     - |
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
 
-# release:
-#   stage: release
-#   image: registry.gitlab.com/gitlab-org/release-cli:latest
-#   rules:
-#     - if: $CI_COMMIT_TAG
-#   script:
-#     - |
-#       release-cli create --name "Release $CI_COMMIT_TAG" --tag-name $CI_COMMIT_TAG \
-#         --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
-#         --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
+release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - |
+      release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "Changelog can be found [here](https://gitlab.com/Kwoth/nadekobot/-/blob/v3/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
+        --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
+        --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
 
 test:
   stage: test
@@ -74,14 +74,14 @@ publish-windows:
   artifacts:
     paths:
       - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
-      - "$INSTALLER_OUTPUT_DIR/releases.json"
+      - "$INSTALLER_OUTPUT_DIR/releases-v3.json"
   script:
     - dotnet clean
     - dotnet restore
     - dotnet publish -c Release --runtime win7-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
     - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
     - iscc.exe "/O+" ".\exe_builder.iss"
-    - echo "{ \"VersionName\":\"$CI_COMMIT_TAG\",\"DownloadLink\":\"https:\/\/cdn.nadeko.bot\/dl\/bot\/v3\/$INSTALLER_FILE_NAME\", }" > "${INSTALLER_OUTPUT_DIR}/releases.json"
+    - echo '{ "VersionName":"$CI_COMMIT_TAG", "DownloadLink":"https://cdn.nadeko.bot/dl/bot/$INSTALLER_FILE_NAME" }' > "${INSTALLER_OUTPUT_DIR}/releases-v3.json"
   tags:
     - windows
 
@@ -93,8 +93,6 @@ upload-windows-updater-release:
     name: amazon/aws-cli
     entrypoint: [""]
   script:
-    - export NADEKOBOT_INSTALL_VERSION=$CI_COMMIT_TAG
-    - ls -l "$INSTALLER_OUTPUT_DIR"
     - aws --version
-    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "test-dl/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
-    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "test-dl/releases.json" --acl public-read --body "$INSTALLER_OUTPUT_DIR/releases.json"
\ No newline at end of file
+    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
+    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v3.json" --acl public-read --body "$INSTALLER_OUTPUT_DIR/releases-v3.json"
\ No newline at end of file