From 9cd87ecf586044de0c24ba4c86e472b750f8d286 Mon Sep 17 00:00:00 2001 From: Nikhil Bhargava <993682+nbhargava@users.noreply.github.com> Date: Tue, 9 May 2023 19:37:10 -0400 Subject: [PATCH 1/3] Add caching to iOS build. --- .github/workflows/platformDeploy.yml | 7 +++++++ .github/workflows/testBuild.yml | 17 ++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index e1b38b713d7b..21a95c5ca932 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -157,6 +157,13 @@ jobs: ruby-version: '2.7' bundler-cache: true + - uses: actions/cache@v2 + with: + path: ios/Pods + key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} + restore-keys: | + ${{ runner.os }}-pods- + - name: Install cocoapods uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350 with: diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index e8027674442d..4eb0988140f6 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -31,7 +31,7 @@ jobs: run: | echo "HAS_READY_TO_BUILD_LABEL=$(gh pr view "${{ env.PULL_REQUEST_NUMBER }}" --repo Expensify/App --json labels --jq '.labels[].name' | grep -q 'Ready To Build' && echo 'true')" >> "$GITHUB_OUTPUT" if [[ "$HAS_READY_TO_BUILD_LABEL" != 'true' ]]; then - echo "The 'Ready to Build' label is not attached to the PR #${{ env.PULL_REQUEST_NUMBER }}" + echo "The 'Ready to Build' label is not attached to the PR #${{ env.PULL_REQUEST_NUMBER }}" fi env: PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }} @@ -74,7 +74,7 @@ jobs: - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it run: | cp .env.staging .env.adhoc - sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc + sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - uses: Expensify/App/.github/actions/composite/setupNode@main @@ -130,7 +130,7 @@ jobs: - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it run: | cp .env.staging .env.adhoc - sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc + sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - uses: Expensify/App/.github/actions/composite/setupNode@main @@ -140,6 +140,13 @@ jobs: ruby-version: '2.7' bundler-cache: true + - uses: actions/cache@v2 + with: + path: ios/Pods + key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} + restore-keys: | + ${{ runner.os }}-pods- + - name: Install cocoapods uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350 with: @@ -193,7 +200,7 @@ jobs: - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it run: | cp .env.staging .env.adhoc - sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc + sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - uses: Expensify/App/.github/actions/composite/setupNode@main @@ -235,7 +242,7 @@ jobs: - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it run: | cp .env.staging .env.adhoc - sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc + sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - uses: Expensify/App/.github/actions/composite/setupNode@main From f4a5e0aa4b76098707a2400bfd1ec840fe35ec6b Mon Sep 17 00:00:00 2001 From: Nikhil Bhargava <993682+nbhargava@users.noreply.github.com> Date: Fri, 12 May 2023 07:44:41 -0400 Subject: [PATCH 2/3] Update .github/workflows/platformDeploy.yml Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com> --- .github/workflows/platformDeploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 21a95c5ca932..92a0d361981f 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -157,7 +157,7 @@ jobs: ruby-version: '2.7' bundler-cache: true - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ios/Pods key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} From d66848bbf35b50f68d8bca109219fa7b9a5f06d1 Mon Sep 17 00:00:00 2001 From: Nikhil Bhargava <993682+nbhargava@users.noreply.github.com> Date: Fri, 12 May 2023 16:13:48 -0400 Subject: [PATCH 3/3] Update .github/workflows/testBuild.yml Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com> --- .github/workflows/testBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index 4eb0988140f6..428986d271a7 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -140,7 +140,7 @@ jobs: ruby-version: '2.7' bundler-cache: true - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ios/Pods key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}