From e49be1b9f0839b768e83809f134095e35a038225 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 12 Jan 2024 19:02:44 +0100 Subject: [PATCH 1/2] Fix branch main x deploy --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d702257..4dc43d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ installer: - win only: - develop - - master + - main before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -98,7 +98,7 @@ installer: # - win # only: # #- feature/Deploy_CI_CD -# # - master +# # - main # - tags # except: # - branches From de3e0cf140f18f4e22cb3555479745113033a64e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 12 Jan 2024 19:23:40 +0100 Subject: [PATCH 2/2] Ancora fix master x CI/CD --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4dc43d8..3aad0c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ variables: $currentTime = get-date -format ddHH; $VersNumb = Get-Content "Resources\VersNum.txt" echo "Curr Version: $VersNumb" - if($CI_COMMIT_BRANCH -eq "master") + if($CI_COMMIT_BRANCH -eq "main") { $version = "stable" }