From 3c3dfd16d5ce157c03f758d0b9d6692a39c790d0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Sep 2021 13:34:08 +0200 Subject: [PATCH] Updated installer output path --- .gitlab-ci.yml | 3 ++- exe_builder.iss | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 890c94dde..8d99783bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ variables: WIN_X64_OUTPUT_DIR: "nadekobot-windows-x64" WIN_X64_RELEASE: "$CI_COMMIT_TAG-windows-x64-build.zip" PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/NadekoBot-build/${CI_COMMIT_TAG}" - INSTALLER_OUTPUT_DIR: "~/Documents/nadeko-installers/${CI_COMMIT_TAG}" + INSTALLER_OUTPUT_DIR: "nadeko-installers/${CI_COMMIT_TAG}" INSTALLER_FILE_NAME: "nadeko-setup-${CI_COMMIT_TAG}.exe" build: @@ -94,6 +94,7 @@ upload-windows-updater-release: 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/releases.json" --acl public-read --body "$INSTALLER_OUTPUT_DIR/releases.json" - 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" \ No newline at end of file diff --git a/exe_builder.iss b/exe_builder.iss index 366ab4103..1d67b88b1 100644 --- a/exe_builder.iss +++ b/exe_builder.iss @@ -15,7 +15,7 @@ SolidCompression=yes UsePreviousLanguage=no UsePreviousSetupType=no UsePreviousAppDir=no -OutputDir=userdocs:nadeko-installers/{#version}/ +OutputDir=nadeko-installers/{#version}/ OutputBaseFilename=nadeko-setup-{#version} AppReadmeFile=https://nadeko.bot/commands ArchitecturesInstallIn64BitMode=x64