diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh index f4b1c5521733..2c9a7dee672a 100755 --- a/.github/scripts/verifyPodfile.sh +++ b/.github/scripts/verifyPodfile.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + START_DIR=$(pwd) ROOT_DIR=$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")") cd "$ROOT_DIR" || exit 1 diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 4d204cab9d55..21216d6946ea 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -209,7 +209,6 @@ jobs: with: path: ios/Pods key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }} - restore-keys: ${{ runner.os }}-pods-cache- - name: Compare Podfile.lock and Manifest.lock id: compare-podfile-and-manifest diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index 1abe22dc395d..98ad829a44bb 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -173,7 +173,6 @@ jobs: with: path: ios/Pods key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }} - restore-keys: ${{ runner.os }}-pods-cache- - name: Compare Podfile.lock and Manifest.lock id: compare-podfile-and-manifest diff --git a/workflow_tests/assertions/platformDeployAssertions.ts b/workflow_tests/assertions/platformDeployAssertions.ts index af80e9f2beb3..31db7167c452 100644 --- a/workflow_tests/assertions/platformDeployAssertions.ts +++ b/workflow_tests/assertions/platformDeployAssertions.ts @@ -154,7 +154,6 @@ function assertIOSJobExecuted(workflowResult: Step[], didExecute = true, isProdu createStepAssertion('Cache Pod dependencies', true, null, 'IOS', 'Cache Pod dependencies', [ {key: 'path', value: 'ios/Pods'}, {key: 'key', value: 'Linux-pods-cache-'}, - {key: 'restore-keys', value: 'Linux-pods-cache-'}, ]), createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'), createStepAssertion('Install cocoapods', true, null, 'IOS', 'Installing cocoapods', [ diff --git a/workflow_tests/assertions/testBuildAssertions.ts b/workflow_tests/assertions/testBuildAssertions.ts index 72b36e47639a..8e1ba1a439d5 100644 --- a/workflow_tests/assertions/testBuildAssertions.ts +++ b/workflow_tests/assertions/testBuildAssertions.ts @@ -158,7 +158,6 @@ function assertIOSJobExecuted(workflowResult: Step[], ref = '', didExecute = tru createStepAssertion('Cache Pod dependencies', true, null, 'IOS', 'Cache Pod dependencies', [ {key: 'path', value: 'ios/Pods'}, {key: 'key', value: 'Linux-pods-cache-'}, - {key: 'restore-keys', value: 'Linux-pods-cache-'}, ]), createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'), createStepAssertion( diff --git a/workflow_tests/mocks/platformDeployMocks.ts b/workflow_tests/mocks/platformDeployMocks.ts index 965c45b01ade..38d4cebb86da 100644 --- a/workflow_tests/mocks/platformDeployMocks.ts +++ b/workflow_tests/mocks/platformDeployMocks.ts @@ -110,7 +110,7 @@ const PLATFORM_DEPLOY__IOS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Ch const PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS'); const PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'IOS'); const PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setting up Ruby', 'IOS', ['ruby-version', 'bundler-cache']); -const PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], { +const PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key'], [], { 'cache-hit': false, }); const PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], { diff --git a/workflow_tests/mocks/testBuildMocks.ts b/workflow_tests/mocks/testBuildMocks.ts index cfd194d07185..643e57ddf675 100644 --- a/workflow_tests/mocks/testBuildMocks.ts +++ b/workflow_tests/mocks/testBuildMocks.ts @@ -110,7 +110,7 @@ const TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep( const TESTBUILD__IOS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'IOS', [], []); const TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK = createMockStep('Setup XCode', 'Setup XCode', 'IOS', [], []); const TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setup Ruby', 'IOS', ['ruby-version', 'bundler-cache'], []); -const TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], { +const TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key'], [], { 'cache-hit': false, }); const TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], {