diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa2a4f17..f731a786 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -197,12 +197,8 @@ TAB3:build: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - variables: '"$CI_COMMIT_BRANCH" -match "$env:APP_NAME"' script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - # rules: - # - if: 'CI_COMMIT_BRANCH -match "$env:APP_NAME"' # ----- Start DEPLOY develop (IIS01) ----- @@ -351,18 +347,13 @@ TAB3:IIS01:deploy: SOL_NAME: MP-TAB3 before_script: - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" only: - variables: '"$CI_COMMIT_BRANCH" -match "$env:APP_NAME"' + - develop needs: ["TAB3:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj - - dotnet restore "$env:SOL_NAME.sln" - # rules: - # - if: 'CI_COMMIT_BRANCH -match "$env:APP_NAME"' - # when: - # branch: - # - ${{CF_BRANCH}} -match # ----- Start DEPLOY master (IIS02/IIS04) ----- LAND:IIS02:deploy: