From 36ab26aaa7f37168e787ea419b15ed5b106e1599 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 1 Apr 2021 11:57:11 +0200
Subject: [PATCH 1/3] staging SEMPRE eseguito

---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee331b8..e26c86c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,9 +100,6 @@ BHS:build:
 
 AC:deploy:
  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:
@@ -125,9 +122,6 @@ AC:deploy:
 
 BHS:deploy:
  stage: staging
- rules:
-   - if: '$CI_COMMIT_BRANCH == "develop"'
-     when: always
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore GPW.sln'  

From 46906e866d544474e3425445626d9d79ede0a2f4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 1 Apr 2021 11:59:41 +0200
Subject: [PATCH 2/3] test yaml x staging

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e26c86c..4ce9b01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,7 +98,7 @@ BHS:build:
 #     - build_job
 
 
-AC:deploy:
+AC:staging:
  stage: staging
 #   only:
 #     - tags  # the build process will only be started by git tag commits
@@ -120,8 +120,10 @@ AC:deploy:
 #  when:
 #    manual
 
-BHS:deploy:
+BHS:staging:
  stage: staging
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "develop"'
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore GPW.sln'  

From f529b7d360d1564646b43a149c8c2cc0bfc1a42a Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 1 Apr 2021 12:01:21 +0200
Subject: [PATCH 3/3] fix staging x develop, deploy x master, installer x
 master

---
 .gitlab-ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ce9b01..4cc6115 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,8 +100,8 @@ BHS:build:
 
 AC:staging:
  stage: staging
-#   only:
-#     - tags  # the build process will only be started by git tag commits
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "develop"'
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore GPW.sln'  
@@ -186,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:
@@ -208,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'