From 81711c557ad5d1a01bdac564fbc1901b83f381ba Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 9 May 2024 13:30:02 +0000 Subject: [PATCH] ci: give up on single file, try to fix docker, medusa builds --- .gitlab-ci.yml | 5 +++-- Dockerfile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e999b2940..ee1915f1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,7 +113,7 @@ build-installer: script: - dotnet clean - dotnet restore -f --no-cache -v n - - dotnet publish -c Release -p:PublishSingleFile=true --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot + - dotnet publish -c Release --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG - iscc.exe "/O+" ".\exe_builder.iss" tags: @@ -121,11 +121,12 @@ build-installer: publish-medusa-package: stage: publish-medusa-package + allow_failure: true rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG script: - LAST_TAG=$(git describe --tags --abbrev=0) - - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG+$CI_COMMIT_SHORT_SHA"; fi + - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-alpha$CI_COMMIT_SHORT_SHA"; fi - cd src/Nadeko.Medusa/ - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY" diff --git a/Dockerfile b/Dockerfile index 6916f9d69..24eabacb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN set -xe; \ useradd -m nadeko; \ apt-get update; \ apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 sudo; \ - update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1; \ + update-alternatives --install /usr/local/bin/python python /usr/bin/python3.9 1; \ echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \ curl -Lo /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp; \ chmod a+rx /usr/local/bin/yt-dlp; \