From 01ff3605c11b7c8c763ccccb34855593f3621ced Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 17 Jan 2025 18:42:03 +0530 Subject: [PATCH 1/4] fix 1 --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aba6770..b56e72f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Configure Git credentials + run: | + git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" + - name: Set up Ruby (for installing Bundler and Fastlane) uses: ruby/setup-ruby@v1 with: @@ -53,6 +57,10 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + + - name: Configure Git credentials + run: | + git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" - name: Set up Ruby (for installing Bundler and Fastlane) uses: ruby/setup-ruby@v1 From ba0b6654748addb38aa16b576da1e3ac3e179662 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 20 Jan 2025 11:51:26 +0530 Subject: [PATCH 2/4] changes to rerun actions --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b56e72f..cf2d83f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Configure Git credentials run: | git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" From b55ec80e81c2b38fedc8c9eae33069e52d79939d Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 20 Jan 2025 12:06:04 +0530 Subject: [PATCH 3/4] changes 2 --- Contentstack.xcodeproj/project.pbxproj | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/Contentstack.xcodeproj/project.pbxproj b/Contentstack.xcodeproj/project.pbxproj index adc56d8..d0959aa 100644 --- a/Contentstack.xcodeproj/project.pbxproj +++ b/Contentstack.xcodeproj/project.pbxproj @@ -255,8 +255,6 @@ 47AAE0902B60420E0098655A /* SyncAPITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47AAE08F2B60420E0098655A /* SyncAPITest.swift */; }; 47AAE0912B60420E0098655A /* SyncAPITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47AAE08F2B60420E0098655A /* SyncAPITest.swift */; }; 47AAE0922B60420E0098655A /* SyncAPITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47AAE08F2B60420E0098655A /* SyncAPITest.swift */; }; - 47B09C252CA952E400B8AB41 /* DVR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47B09C242CA952E400B8AB41 /* DVR.framework */; }; - 47B09C262CA952E400B8AB41 /* DVR.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 47B09C242CA952E400B8AB41 /* DVR.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 47B09C292CA9530100B8AB41 /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 47B09C282CA9530100B8AB41 /* ContentstackUtils */; }; 47B4DC622C232A8200370CFC /* TaxonomyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DC612C232A8200370CFC /* TaxonomyTest.swift */; }; 47B4DC632C232A8200370CFC /* TaxonomyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DC612C232A8200370CFC /* TaxonomyTest.swift */; }; @@ -267,6 +265,7 @@ 47C6EFC52C0B5B9400F0D5CF /* Taxonomy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */; }; 47D561512C9EF97D00DC085D /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 47D561502C9EF97D00DC085D /* ContentstackUtils */; }; 47D561572C9EFA5900DC085D /* DVR in Frameworks */ = {isa = PBXBuildFile; productRef = 47D561562C9EFA5900DC085D /* DVR */; }; + 6750778E2D3E256A0076A066 /* DVR in Frameworks */ = {isa = PBXBuildFile; productRef = 6750778D2D3E256A0076A066 /* DVR */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -293,20 +292,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 47B09C272CA952E400B8AB41 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 47B09C262CA952E400B8AB41 /* DVR.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 0F0246652431F37300F72181 /* ImageTransform.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageTransform.swift; sourceTree = ""; }; 0F02466A243201B500F72181 /* ImageTransformTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageTransformTest.swift; sourceTree = ""; }; @@ -444,8 +429,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 6750778E2D3E256A0076A066 /* DVR in Frameworks */, 0F4A75F4241BAE6C00E3A024 /* Contentstack.framework in Frameworks */, - 47B09C252CA952E400B8AB41 /* DVR.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -845,7 +830,6 @@ 0F4A75EF241BAE6C00E3A024 /* Sources */, 0F4A75F0241BAE6C00E3A024 /* Frameworks */, 0F4A75F1241BAE6C00E3A024 /* Resources */, - 47B09C272CA952E400B8AB41 /* Embed Frameworks */, ); buildRules = ( ); @@ -2630,6 +2614,11 @@ package = 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */; productName = DVR; }; + 6750778D2D3E256A0076A066 /* DVR */ = { + isa = XCSwiftPackageProductDependency; + package = 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */; + productName = DVR; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = OBJ_1 /* Project object */; From 4f80d9f9a1b1d24471c70649293938686db3b003 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 20 Jan 2025 12:19:49 +0530 Subject: [PATCH 4/4] fulfill called multiple times hence causing workflow to fail --- .github/workflows/ci.yml | 1 + Tests/TaxonomyTest.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf2d83f..60ed478 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Configure Git credentials run: | git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" diff --git a/Tests/TaxonomyTest.swift b/Tests/TaxonomyTest.swift index 9928ac3..90e1567 100644 --- a/Tests/TaxonomyTest.swift +++ b/Tests/TaxonomyTest.swift @@ -141,7 +141,7 @@ class TaxonomyTest: XCTestCase { } networkExpectation.fulfill() } - networkExpectation.fulfill() + wait(for: [networkExpectation], timeout: 5) } }