From ca52f27b49658890e7bd4574572122d4bca818ed Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 28 Aug 2024 10:27:04 +0100 Subject: [PATCH 1/3] build: update workflow #12 --- .coauthor/development/architecture/system/soup.yaml | 6 +++--- .github/workflows/ios.yml | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.coauthor/development/architecture/system/soup.yaml b/.coauthor/development/architecture/system/soup.yaml index 385588b..d73c2d0 100644 --- a/.coauthor/development/architecture/system/soup.yaml +++ b/.coauthor/development/architecture/system/soup.yaml @@ -1,6 +1,6 @@ Name: System SOUP: - - PURL: pkg:swift/github.com/aws-amplify/amplify-swift@2.35.5 + - PURL: pkg:swift/github.com/aws-amplify/amplify-swift@2.36.0 Manufacturer: AWS PackageManager: Swift Package Manager Requirement: | @@ -64,11 +64,11 @@ SOUP: VerificationReasoning: | Verification Reasoning Line 1 Verification Reasoning Line 2 - - PURL: pkg:swift/github.com/application-source/third-party-package@1.0.1 + - PURL: pkg:swift/github.com/apple/swift-log@1.6.1 Manufacturer: SC PackageManager: Swift Package Manager Requirement: | - This is not included in SBOM to test the GH Check. again + This is for logging. VerificationReasoning: | Verification Reasoning Line 1 Verification Reasoning Line 2 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 788c5c5..ca2a5c3 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -33,7 +33,6 @@ jobs: type: 'bdd' format: 'cucumber+ndjson' path: '${{ env.path_system }}/**' - hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' build: name: Build and Test default scheme using any available iPhone simulator runs-on: macos-latest @@ -86,7 +85,6 @@ jobs: type: 'sbom' format: 'cyclonedx' path: '${{ env.path_sbom }}/**' - hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' - name: Install XCBeautify 2.4.1 run: | # Install xcbeautify from source, used to generate junit file from xcodebuild output @@ -129,7 +127,6 @@ jobs: type: 'test' format: 'junit' path: ${{ env.path_test_reports }} - hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' - name: Upload Cucumber Test Results uses: actions/upload-artifact@v4 with: From e3bd8ae39b88656880ad807b5e8140c6914e879a Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 28 Aug 2024 10:36:57 +0100 Subject: [PATCH 2/3] adds aws domain to hostnames #12 --- .github/workflows/ios.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index ca2a5c3..507fd29 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -33,6 +33,7 @@ jobs: type: 'bdd' format: 'cucumber+ndjson' path: '${{ env.path_system }}/**' + hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' build: name: Build and Test default scheme using any available iPhone simulator runs-on: macos-latest @@ -85,6 +86,7 @@ jobs: type: 'sbom' format: 'cyclonedx' path: '${{ env.path_sbom }}/**' + hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' - name: Install XCBeautify 2.4.1 run: | # Install xcbeautify from source, used to generate junit file from xcodebuild output @@ -127,9 +129,11 @@ jobs: type: 'test' format: 'junit' path: ${{ env.path_test_reports }} + hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' - name: Upload Cucumber Test Results uses: actions/upload-artifact@v4 with: name: cucumber-test-results path: ${{ steps.run-tests.outputs.report_file }} + From 7186b902183905e7d3a967d9f7375a41c8d9a2cd Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 28 Aug 2024 11:40:47 +0100 Subject: [PATCH 3/3] build: update xcbeautify #12 --- .github/workflows/ios.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 507fd29..535e760 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -87,13 +87,13 @@ jobs: format: 'cyclonedx' path: '${{ env.path_sbom }}/**' hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' - - name: Install XCBeautify 2.4.1 + - name: Install XCBeautify 2.11.0 run: | # Install xcbeautify from source, used to generate junit file from xcodebuild output cd .. git clone https://github.com/cpisciotta/xcbeautify.git cd xcbeautify - git checkout tags/2.4.1 + git checkout tags/2.11.0 make install - name: Test id: run-tests @@ -130,10 +130,3 @@ jobs: format: 'junit' path: ${{ env.path_test_reports }} hostname: 'sao2zyjy5e.execute-api.eu-west-1.amazonaws.com' - - name: Upload Cucumber Test Results - uses: actions/upload-artifact@v4 - with: - name: cucumber-test-results - path: ${{ steps.run-tests.outputs.report_file }} - -