Merge branch 'develop' into feature/CICD

.gitlab-ci.yml

@@ -98,13 +98,10 @@ BHS:build:
 #     - build_job
 
 
-AC:deploy:
+AC:staging:
  stage: staging
  rules:
    - if: '$CI_COMMIT_BRANCH == "develop"'
-     when: always
-#   only:
-#     - tags  # the build process will only be started by git tag commits
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore GPW.sln'  
@@ -123,11 +120,10 @@ AC:deploy:
 #  when:
 #    manual
 
-BHS:deploy:
+BHS:staging:
  stage: staging
  rules:
    - if: '$CI_COMMIT_BRANCH == "develop"'
-     when: always
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore GPW.sln'  
@@ -190,8 +186,8 @@ BHS:deploy:
 
 AC:install:
  stage: installer
-#  rules:
-#    - if: '$CI_COMMIT_BRANCH == "develop"'
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "master"'
 #   only:
 #     - tags  # the build process will only be started by git tag commits
  before_script:
@@ -212,6 +208,10 @@ AC:install:
 
 BHS:install:
  stage: installer
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "master"'
+#   only:
+#     - tags  # the build process will only be started by git tag commits
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore GPW.sln'