From 492e59f6d5f1f76478c648459c326c7d5fba147a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 16 Nov 2023 19:32:17 +0100 Subject: [PATCH 01/12] Update shadows x LAND --- .gitlab-ci.yml | 1 + MP.Land/Components/CmpFooter.razor | 2 +- MP.Land/MP.Land.csproj | 4 +- MP.Land/Pages/About.razor | 30 ++++++------ MP.Land/Pages/Contacts.razor | 4 +- MP.Land/Pages/Index.razor | 4 +- MP.Land/Pages/SysInfo.razor | 4 +- MP.Land/Pages/UpdateManager.razor | 4 +- MP.Land/Pages/UserQr.razor | 2 +- MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Land/wwwroot/img/LogoEgalware.svg | 21 +++++++++ MP.Land/wwwroot/img/LogoEgalwareBianco.svg | 55 ++++++++++++++++++++++ 14 files changed, 108 insertions(+), 29 deletions(-) create mode 100644 MP.Land/wwwroot/img/LogoEgalware.svg create mode 100644 MP.Land/wwwroot/img/LogoEgalwareBianco.svg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f731a786..33c96601 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,6 +214,7 @@ LAND:IIS01:deploy: - dotnet restore "$env:SOL_NAME.sln" only: - develop + - feature\/LAND.+ needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj diff --git a/MP.Land/Components/CmpFooter.razor b/MP.Land/Components/CmpFooter.razor index 75e13002..1ba50c22 100644 --- a/MP.Land/Components/CmpFooter.razor +++ b/MP.Land/Components/CmpFooter.razor @@ -4,7 +4,7 @@
@adesso - Egalware + Egalware  
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 2cc99106..424ea1e4 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2311.1009 + 6.16.2311.1619 @@ -44,6 +44,8 @@ + + diff --git a/MP.Land/Pages/About.razor b/MP.Land/Pages/About.razor index 945c6f4d..58a78d18 100644 --- a/MP.Land/Pages/About.razor +++ b/MP.Land/Pages/About.razor @@ -6,7 +6,7 @@
-
+
@@ -16,7 +16,7 @@
- powered by EgalWare + powered by EgalWare  
@@ -41,51 +41,51 @@

Info installazione

-
+
Remote Server:
-
+
@ServerStatus
-
+
Cliente:
-
+
@Installazione
-
+
App:
-
+
@Applicazione
-
+
Licenze:
-
+
@Licenze
-
+
Scadenza:
-
+
@($"{Scadenza:yyyy/MM/dd}")
-
+
Key
-
- @MastKey +
+
diff --git a/MP.Land/Pages/Contacts.razor b/MP.Land/Pages/Contacts.razor index d621d0db..0c2f4157 100644 --- a/MP.Land/Pages/Contacts.razor +++ b/MP.Land/Pages/Contacts.razor @@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@
- powered by EgalWare + powered by EgalWare  
diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 1d0d640f..95835196 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -3,7 +3,7 @@ @using MP.Land.Data @using MP.Land.Components -
+

MAPO Land

@@ -24,7 +24,7 @@
-
+
@if (ListRecords == null) { diff --git a/MP.Land/Pages/SysInfo.razor b/MP.Land/Pages/SysInfo.razor index f4e8ffe2..810db569 100644 --- a/MP.Land/Pages/SysInfo.razor +++ b/MP.Land/Pages/SysInfo.razor @@ -9,7 +9,7 @@
-
+
@@ -19,7 +19,7 @@
- powered by EgalWare + powered by EgalWare
diff --git a/MP.Land/Pages/UpdateManager.razor b/MP.Land/Pages/UpdateManager.razor index 454cea83..8e50d9b2 100644 --- a/MP.Land/Pages/UpdateManager.razor +++ b/MP.Land/Pages/UpdateManager.razor @@ -4,7 +4,7 @@ @using MP.Land.Components @inject LicenseService LicServ -
+
@@ -43,7 +43,7 @@
} -
+
@if (ListRecords == null) { diff --git a/MP.Land/Pages/UserQr.razor b/MP.Land/Pages/UserQr.razor index 9f46b8c4..02a5b38c 100644 --- a/MP.Land/Pages/UserQr.razor +++ b/MP.Land/Pages/UserQr.razor @@ -3,7 +3,7 @@ @using MP.Land.Data @using MP.Land.Components -
+
@if (ListRecords == null) diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 2076f49f..609a99c8 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2311.1009

+

Versione: 6.16.2311.1619


Note di rilascio:
    diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index cf39a0ed..1cc366fe 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2311.1009 +6.16.2311.1619 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index e09e8ed5..faf03670 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2311.1009 + 6.16.2311.1619 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Land/wwwroot/img/LogoEgalware.svg b/MP.Land/wwwroot/img/LogoEgalware.svg new file mode 100644 index 00000000..afcdb10c --- /dev/null +++ b/MP.Land/wwwroot/img/LogoEgalware.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/MP.Land/wwwroot/img/LogoEgalwareBianco.svg b/MP.Land/wwwroot/img/LogoEgalwareBianco.svg new file mode 100644 index 00000000..acb59f58 --- /dev/null +++ b/MP.Land/wwwroot/img/LogoEgalwareBianco.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 374cb3478d771b508fa462469bcb911ddd192816 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 16 Nov 2023 19:35:19 +0100 Subject: [PATCH 02/12] test recogn feature --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33c96601..9cdea2ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,7 +214,7 @@ LAND:IIS01:deploy: - dotnet restore "$env:SOL_NAME.sln" only: - develop - - feature\/LAND.+ + - /^feature\/LAND.+ needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj From ac883d85d5c011f82ab2aa85d75b6ae408ba2956 Mon Sep 17 00:00:00 2001 From: Samuele Emilio Locatelli Date: Thu, 16 Nov 2023 18:38:09 +0000 Subject: [PATCH 03/12] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cdea2ee..0fba5e4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,7 +214,7 @@ LAND:IIS01:deploy: - dotnet restore "$env:SOL_NAME.sln" only: - develop - - /^feature\/LAND.+ + - .+LAND.+ needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj From 8edd19a5f3a1debe4343ccb598d55f640cdc8347 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 17 Nov 2023 08:39:11 +0100 Subject: [PATCH 04/12] update test yaml syntax --- .gitlab-ci.yml | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fba5e4b..2885c836 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,6 +90,10 @@ LAND:build: variables: APP_NAME: MP.Land SOL_NAME: MP-LAND + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/LAND* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -103,6 +107,10 @@ PROG:build: variables: APP_NAME: MP.Prog SOL_NAME: MP-PROG + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/PROG* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -116,6 +124,10 @@ STAT:build: variables: APP_NAME: MP.Stats SOL_NAME: MP-STATS + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/STAT* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -129,6 +141,10 @@ MON:build: variables: APP_NAME: MP.Mon SOL_NAME: MP-MON + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/MON* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -142,6 +158,10 @@ SPEC:build: variables: APP_NAME: MP.SPEC SOL_NAME: MP-SPEC + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/SPEC* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -155,6 +175,10 @@ INVE:build: variables: APP_NAME: MP.INVE SOL_NAME: MP-INVE + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/INVE* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -168,6 +192,10 @@ CONF:build: variables: APP_NAME: IobConf.UI SOL_NAME: IobConf + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/CONF* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -181,6 +209,10 @@ IOC:build: variables: APP_NAME: MP.IOC SOL_NAME: MP-IOC + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/IOC* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -194,6 +226,10 @@ TAB3:build: variables: APP_NAME: MP-TAB-SERV SOL_NAME: MP-TAB3 + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH =~ /^feature/TAB* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -212,9 +248,13 @@ LAND:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - .+LAND.+ + # only: + # - develop + # - feature/LAND.+ + rules: + - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH =~ /^feature/LAND* + needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj From 4133c5b4e1738aa4bd5c8bb723a6137b5f54692e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 17 Nov 2023 08:45:40 +0100 Subject: [PATCH 05/12] Update syntax --- .gitlab-ci.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2885c836..d77141c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,8 +91,8 @@ LAND:build: APP_NAME: MP.Land SOL_NAME: MP-LAND rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/LAND* before_script: - *nuget-fix @@ -108,8 +108,8 @@ PROG:build: APP_NAME: MP.Prog SOL_NAME: MP-PROG rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/PROG* before_script: - *nuget-fix @@ -125,8 +125,8 @@ STAT:build: APP_NAME: MP.Stats SOL_NAME: MP-STATS rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/STAT* before_script: - *nuget-fix @@ -142,8 +142,8 @@ MON:build: APP_NAME: MP.Mon SOL_NAME: MP-MON rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/MON* before_script: - *nuget-fix @@ -159,8 +159,8 @@ SPEC:build: APP_NAME: MP.SPEC SOL_NAME: MP-SPEC rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/SPEC* before_script: - *nuget-fix @@ -176,8 +176,8 @@ INVE:build: APP_NAME: MP.INVE SOL_NAME: MP-INVE rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/INVE* before_script: - *nuget-fix @@ -193,8 +193,8 @@ CONF:build: APP_NAME: IobConf.UI SOL_NAME: IobConf rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/CONF* before_script: - *nuget-fix @@ -210,8 +210,8 @@ IOC:build: APP_NAME: MP.IOC SOL_NAME: MP-IOC rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/IOC* before_script: - *nuget-fix @@ -227,8 +227,8 @@ TAB3:build: APP_NAME: MP-TAB-SERV SOL_NAME: MP-TAB3 rules: - - if: $CI_COMMIT_BRANCH == develop - - if: $CI_COMMIT_BRANCH == master + - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH =~ /^feature/TAB* before_script: - *nuget-fix @@ -252,7 +252,7 @@ LAND:IIS01:deploy: # - develop # - feature/LAND.+ rules: - - if: $CI_COMMIT_BRANCH == develop + - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH =~ /^feature/LAND* needs: ["LAND:build"] From 066bdf911b3a6cc08b1077c90b0d231a5d4abf83 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 17 Nov 2023 08:47:55 +0100 Subject: [PATCH 06/12] update yaml --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d77141c6..638e8768 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ LAND:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/LAND* + - if: $CI_COMMIT_BRANCH =~ "/^feature/LAND.+" before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -110,7 +110,7 @@ PROG:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/PROG* + # - if: $CI_COMMIT_BRANCH =~ /^feature/PROG* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -127,7 +127,7 @@ STAT:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/STAT* + # - if: $CI_COMMIT_BRANCH =~ /^feature/STAT* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -144,7 +144,7 @@ MON:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/MON* + # - if: $CI_COMMIT_BRANCH =~ /^feature/MON* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -161,7 +161,7 @@ SPEC:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/SPEC* + # - if: $CI_COMMIT_BRANCH =~ /^feature/SPEC* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -178,7 +178,7 @@ INVE:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/INVE* + # - if: $CI_COMMIT_BRANCH =~ /^feature/INVE* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -195,7 +195,7 @@ CONF:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/CONF* + # - if: $CI_COMMIT_BRANCH =~ /^feature/CONF* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -212,7 +212,7 @@ IOC:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/IOC* + # - if: $CI_COMMIT_BRANCH =~ /^feature/IOC* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -229,7 +229,7 @@ TAB3:build: rules: - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ /^feature/TAB* + # - if: $CI_COMMIT_BRANCH =~ /^feature/TAB* before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -253,7 +253,7 @@ LAND:IIS01:deploy: # - feature/LAND.+ rules: - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH =~ /^feature/LAND* + - if: $CI_COMMIT_BRANCH =~ "/^feature/LAND.+" needs: ["LAND:build"] script: From 9e8a94c94e5d69c4973c03f071d29bcf2d57c7ac Mon Sep 17 00:00:00 2001 From: Samuele Emilio Locatelli Date: Fri, 17 Nov 2023 08:08:41 +0000 Subject: [PATCH 07/12] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 638e8768..b2eaea8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,13 +91,16 @@ LAND:build: APP_NAME: MP.Land SOL_NAME: MP-LAND rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ "/^feature/LAND.+" + # - if: $CI_COMMIT_BRANCH =~ /^feature/ + # when: never + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + # - if: $CI_COMMIT_BRANCH =~ /^feature/LAND.+/ before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" script: + - echo $CI_COMMIT_BRANCH - dotnet build $env:APP_NAME/$env:APP_NAME.csproj PROG:build: @@ -108,9 +111,11 @@ PROG:build: APP_NAME: MP.Prog SOL_NAME: MP-PROG rules: + - if: $CI_COMMIT_BRANCH =~ "feature/" + when: never - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/PROG* + - if: $CI_COMMIT_BRANCH =~ "feature/PROG.+" before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" From 2d68d35cdab23a5332344930d557b50f95b550be Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 17 Nov 2023 09:10:47 +0100 Subject: [PATCH 08/12] altro test yaml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2eaea8a..505e7d2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,11 +91,11 @@ LAND:build: APP_NAME: MP.Land SOL_NAME: MP-LAND rules: - # - if: $CI_COMMIT_BRANCH =~ /^feature/ - # when: never + - if: $CI_COMMIT_BRANCH =~ /^feature/ + when: never - if: $CI_COMMIT_BRANCH == 'develop' - if: $CI_COMMIT_BRANCH == 'master' - # - if: $CI_COMMIT_BRANCH =~ /^feature/LAND.+/ + - if: $CI_COMMIT_BRANCH =~ /^feature/LAND.+/ before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" From 3f29166c0efc57d38b51be28c17cf66fdb234e39 Mon Sep 17 00:00:00 2001 From: Samuele Emilio Locatelli Date: Fri, 17 Nov 2023 08:11:45 +0000 Subject: [PATCH 09/12] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 505e7d2a..112846b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,11 +91,11 @@ LAND:build: APP_NAME: MP.Land SOL_NAME: MP-LAND rules: - - if: $CI_COMMIT_BRANCH =~ /^feature/ - when: never + # - if: $CI_COMMIT_BRANCH =~ /^feature/ + # when: never - if: $CI_COMMIT_BRANCH == 'develop' - if: $CI_COMMIT_BRANCH == 'master' - - if: $CI_COMMIT_BRANCH =~ /^feature/LAND.+/ + - if: $CI_COMMIT_BRANCH =~ 'feature/LAND.+' before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" From 14477c59282f682bc000be14973407d6672aa84e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 17 Nov 2023 09:14:17 +0100 Subject: [PATCH 10/12] cambio sintassi --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 112846b3..d29c6611 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,7 +95,8 @@ LAND:build: # when: never - if: $CI_COMMIT_BRANCH == 'develop' - if: $CI_COMMIT_BRANCH == 'master' - - if: $CI_COMMIT_BRANCH =~ 'feature/LAND.+' + - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" From f2ec177bb7a08b71a2c040e5cc1e287d182377b9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 17 Nov 2023 09:17:14 +0100 Subject: [PATCH 11/12] Completata review x primi step LAND --- .gitlab-ci.yml | 69 ++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d29c6611..51b0fcf2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,8 +91,6 @@ LAND:build: APP_NAME: MP.Land SOL_NAME: MP-LAND rules: - # - if: $CI_COMMIT_BRANCH =~ /^feature/ - # when: never - if: $CI_COMMIT_BRANCH == 'develop' - if: $CI_COMMIT_BRANCH == 'master' - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/ @@ -112,11 +110,10 @@ PROG:build: APP_NAME: MP.Prog SOL_NAME: MP-PROG rules: - - if: $CI_COMMIT_BRANCH =~ "feature/" - when: never - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - - if: $CI_COMMIT_BRANCH =~ "feature/PROG.+" + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/PROG.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -131,9 +128,10 @@ STAT:build: APP_NAME: MP.Stats SOL_NAME: MP-STATS rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/STAT* + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/STAT.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -148,9 +146,10 @@ MON:build: APP_NAME: MP.Mon SOL_NAME: MP-MON rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/MON* + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/MON.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -165,9 +164,10 @@ SPEC:build: APP_NAME: MP.SPEC SOL_NAME: MP-SPEC rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/SPEC* + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/SPEC.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -182,9 +182,10 @@ INVE:build: APP_NAME: MP.INVE SOL_NAME: MP-INVE rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/INVE* + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/INVE.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -199,9 +200,10 @@ CONF:build: APP_NAME: IobConf.UI SOL_NAME: IobConf rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/CONF* + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/CONF.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -216,9 +218,10 @@ IOC:build: APP_NAME: MP.IOC SOL_NAME: MP-IOC rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/IOC* + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -233,9 +236,10 @@ TAB3:build: APP_NAME: MP-TAB-SERV SOL_NAME: MP-TAB3 rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == "master" - # - if: $CI_COMMIT_BRANCH =~ /^feature/TAB* + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/TAB.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -254,12 +258,11 @@ LAND:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - # only: - # - develop - # - feature/LAND.+ rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH =~ "/^feature/LAND.+" + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/ + when: always needs: ["LAND:build"] script: From 93ab3e808801016c638f7c3e01ae95504a142533 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 17 Nov 2023 09:29:32 +0100 Subject: [PATCH 12/12] review globale yaml --- .gitlab-ci.yml | 128 ++++++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 59 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51b0fcf2..04c811f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -260,10 +260,8 @@ LAND:IIS01:deploy: - dotnet restore "$env:SOL_NAME.sln" rules: - if: $CI_COMMIT_BRANCH == 'develop' - - if: $CI_COMMIT_BRANCH == 'master' - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/ when: always - needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -279,8 +277,10 @@ PROG:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/PROG.+/ + when: always needs: ["PROG:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -296,8 +296,10 @@ STAT:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/STAT.+/ + when: always needs: ["STAT:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -313,8 +315,10 @@ MON:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/MON.+/ + when: always needs: ["MON:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -330,8 +334,10 @@ SPEC:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/SPEC.+/ + when: always needs: ["SPEC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -347,8 +353,10 @@ INVE:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/INVE.+/ + when: always needs: ["INVE:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -364,8 +372,10 @@ CONF:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/CONF.+/ + when: always needs: ["CONF:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -381,8 +391,10 @@ IOC:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/ + when: always needs: ["IOC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -398,8 +410,10 @@ TAB3:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/TAB.+/ + when: always needs: ["TAB3:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -416,8 +430,8 @@ LAND:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -434,8 +448,8 @@ PROG:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["PROG:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -452,8 +466,8 @@ STAT:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["STAT:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -470,8 +484,8 @@ MON:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["MON:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -488,8 +502,8 @@ SPEC:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["SPEC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -506,8 +520,8 @@ INVE:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["INVE:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -524,8 +538,8 @@ CONF:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["CONF:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -542,8 +556,8 @@ IOC:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["IOC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -562,9 +576,9 @@ LAND:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -584,9 +598,9 @@ PROG:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["PROG:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -606,9 +620,9 @@ STAT:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["STAT:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -628,9 +642,9 @@ MON:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["MON:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -650,9 +664,9 @@ SPEC:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["SPEC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -672,9 +686,9 @@ INVE:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["INVE:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -716,9 +730,9 @@ IOC:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["IOC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -763,8 +777,6 @@ PROG:release: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" only: - #- feature/Deploy_CI_CD - # - master - tags except: - branches @@ -788,8 +800,6 @@ STAT:release: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" only: - #- feature/Deploy_CI_CD - # - master - tags except: - branches