From 2d13824b52013f4a4b45598267f58f29c5e7b611 Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:44:19 +0300 Subject: [PATCH 01/11] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d2463d14..37d063aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('jenkins-library@feature/DOPS-3035') _ +@Library('jenkins-library@feature/DOPS-3035-mv_to_lib') _ //Test jenkins def pipeline = new org.ios.ShareFeature( steps: this, From 4d02771614ecfbd420176bf31f8877980a10e2cf Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:57:35 +0300 Subject: [PATCH 02/11] Update Jenkinsfile --- Jenkinsfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 37d063aa..8a3baf89 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,16 @@ @Library('jenkins-library@feature/DOPS-3035-mv_to_lib') _ //Test jenkins -def pipeline = new org.ios.ShareFeature( +def pipeline = new org.ios.AppPipeline( steps: this, dojoProductType: "sora-mobile", - lintCmd: 'cd tools/swiftformat && ./swiftformat --lint ./../../Sources', - testCmd: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", - buildCmd: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", + //lintCmd: 'cd tools/swiftformat && ./swiftformat --lint ./../../Sources', + //testCmd: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", + //buildCmd: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", sonarProjectKey: "sora:shared-features-spm", - sonarProjectName: "shared-features-spm" + sonarProjectName: "shared-features-spm", + lintEnable: 'false', + disableUpdatePods: true, + disableInstallPods: true ) pipeline.runPipeline() From 45a5ba7e73b0f749016caaebf2a34fd361a5060a Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 21:20:13 +0300 Subject: [PATCH 03/11] Update Jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a3baf89..d7454a9b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,9 @@ def pipeline = new org.ios.AppPipeline( sonarProjectName: "shared-features-spm", lintEnable: 'false', disableUpdatePods: true, - disableInstallPods: true + disableInstallPods: true, + appEnable: false, + sharedFeature: true ) -pipeline.runPipeline() +pipeline.runPipeline('sora') From 1782d325bee35f48c4c83ec28a5cb0c1a170eafa Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 21:25:24 +0300 Subject: [PATCH 04/11] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d7454a9b..c79135ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,8 @@ def pipeline = new org.ios.AppPipeline( disableUpdatePods: true, disableInstallPods: true, appEnable: false, - sharedFeature: true + sharedFeature: true, + disableSecretScanner: true ) pipeline.runPipeline('sora') From 1664b6167ba7d1b51a9d90bc2bd67ab4469e0594 Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 21:47:01 +0300 Subject: [PATCH 05/11] Update Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c79135ed..8fc93ca5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,9 @@ def pipeline = new org.ios.AppPipeline( //buildCmd: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", sonarProjectKey: "sora:shared-features-spm", sonarProjectName: "shared-features-spm", - lintEnable: 'false', + lintEnable: 'true', + linterFile: './tools/swiftformat/swiftformat', + lintDir: './Sources/' disableUpdatePods: true, disableInstallPods: true, appEnable: false, From 31dec6571522d95375db938981eefe979f4944de Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 21:48:07 +0300 Subject: [PATCH 06/11] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8fc93ca5..3bc548e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ def pipeline = new org.ios.AppPipeline( sonarProjectName: "shared-features-spm", lintEnable: 'true', linterFile: './tools/swiftformat/swiftformat', - lintDir: './Sources/' + lintDir: './Sources/', disableUpdatePods: true, disableInstallPods: true, appEnable: false, From 80824060b584fd2faff1be37fc0075cc2b81f0f5 Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:01:14 +0300 Subject: [PATCH 07/11] Update Jenkinsfile --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3bc548e5..273780f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,9 +3,8 @@ def pipeline = new org.ios.AppPipeline( steps: this, dojoProductType: "sora-mobile", - //lintCmd: 'cd tools/swiftformat && ./swiftformat --lint ./../../Sources', - //testCmd: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", - //buildCmd: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", + sharedFeatureTest: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", + sharedFeatureBuild: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", sonarProjectKey: "sora:shared-features-spm", sonarProjectName: "shared-features-spm", lintEnable: 'true', From 2b2c0231d2e1d83da2c3ff0f31e6753b7820c9a3 Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:09:44 +0300 Subject: [PATCH 08/11] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 273780f1..ea7ad189 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,8 +3,9 @@ def pipeline = new org.ios.AppPipeline( steps: this, dojoProductType: "sora-mobile", - sharedFeatureTest: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", sharedFeatureBuild: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", + sharedFeatureTest: sharedFeatureBuild + " test" + //sharedFeatureTest: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", sonarProjectKey: "sora:shared-features-spm", sonarProjectName: "shared-features-spm", lintEnable: 'true', From f0065ae87816d5a5f4b3ee4ebe807fe90c6438ab Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:10:32 +0300 Subject: [PATCH 09/11] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea7ad189..09702752 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ def pipeline = new org.ios.AppPipeline( steps: this, dojoProductType: "sora-mobile", sharedFeatureBuild: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", - sharedFeatureTest: sharedFeatureBuild + " test" + sharedFeatureTest: sharedFeatureBuild + " test", //sharedFeatureTest: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", sonarProjectKey: "sora:shared-features-spm", sonarProjectName: "shared-features-spm", From 977806e70861c5dacb62e1f4f2d5cf8da7bf6777 Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:12:13 +0300 Subject: [PATCH 10/11] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09702752..aec6820c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ def pipeline = new org.ios.AppPipeline( steps: this, dojoProductType: "sora-mobile", sharedFeatureBuild: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", - sharedFeatureTest: sharedFeatureBuild + " test", + sharedFeatureTest: ${sharedFeatureBuild} + " test", //sharedFeatureTest: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", sonarProjectKey: "sora:shared-features-spm", sonarProjectName: "shared-features-spm", From 937c621fa2e4e2fafc5ca400dbc6e0068c0cd68f Mon Sep 17 00:00:00 2001 From: marat-biriushev <49524488+marat-biriushev@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:13:15 +0300 Subject: [PATCH 11/11] Update Jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aec6820c..4c4ecd8e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,8 +4,7 @@ def pipeline = new org.ios.AppPipeline( steps: this, dojoProductType: "sora-mobile", sharedFeatureBuild: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'", - sharedFeatureTest: ${sharedFeatureBuild} + " test", - //sharedFeatureTest: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", + sharedFeatureTest: "xcodebuild -scheme Modules-Package -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' test", sonarProjectKey: "sora:shared-features-spm", sonarProjectName: "shared-features-spm", lintEnable: 'true',