From c28b03978c640e4e7e84ba6ce30126e7bd27eda3 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 14:27:56 -0500 Subject: [PATCH 01/13] Attempt to cache mocks --- .github/workflows/flutter-prep.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 7e1e9a9149b..c3303979495 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -71,3 +71,17 @@ jobs: ./flutter-sdk/bin/flutter config --no-analytics ./flutter-sdk/bin/flutter doctor ./flutter-sdk/bin/cache/dart-sdk/bin/dart --disable-analytics + + - name: Generate Mocks + run: | + # Fetch dependencies + ./tool/bin/devtools_tool pub-get --only-main + + # Generate code. + ./tool/bin/devtools_tool generate-code + - name: Cache Mocks + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + with: + path: | + ./packages/**mocks** + key: flutter-sdk-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${GITHUB_SHA} From 2b0dcac416535399adec8ba253dd853c02e29668 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 14:28:18 -0500 Subject: [PATCH 02/13] better cachew name --- .github/workflows/flutter-prep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index c3303979495..15349585f1c 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -84,4 +84,4 @@ jobs: with: path: | ./packages/**mocks** - key: flutter-sdk-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${GITHUB_SHA} + key: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${GITHUB_SHA} From 9281ac23dcb7eadf9afe9f26f4278febc331e7f1 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 15:07:33 -0500 Subject: [PATCH 03/13] expose flutter-sdk --- .github/workflows/flutter-prep.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 15349585f1c..539d2f38145 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -74,6 +74,8 @@ jobs: - name: Generate Mocks run: | + export PATH="$PATH":`pwd`/tool/flutter-sdk/bin/ + # Fetch dependencies ./tool/bin/devtools_tool pub-get --only-main From d22daa6cca8a295d09c8c8389610e9cd953445ce Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 15:18:47 -0500 Subject: [PATCH 04/13] echo path --- .github/workflows/flutter-prep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 539d2f38145..56ef8e8f991 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -75,7 +75,7 @@ jobs: - name: Generate Mocks run: | export PATH="$PATH":`pwd`/tool/flutter-sdk/bin/ - + echo $PATH # Fetch dependencies ./tool/bin/devtools_tool pub-get --only-main From 040e5689ee7e50bfb07e914170825470ad7f3002 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 15:28:35 -0500 Subject: [PATCH 05/13] different dart loc --- .github/workflows/flutter-prep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 56ef8e8f991..061b7cc6efc 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -74,7 +74,7 @@ jobs: - name: Generate Mocks run: | - export PATH="$PATH":`pwd`/tool/flutter-sdk/bin/ + export PATH="$PATH":`pwd`/flutter-sdk/bin/cache/dart-sdk/bin/ echo $PATH # Fetch dependencies ./tool/bin/devtools_tool pub-get --only-main From e59f16294a7d32902e9c2dcd30b66053e4c10460 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 16:23:27 -0500 Subject: [PATCH 06/13] pub get tool --- .github/workflows/flutter-prep.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 061b7cc6efc..cb565b0ae38 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -74,6 +74,9 @@ jobs: - name: Generate Mocks run: | + pushd tool/ + flutter pub get + popd export PATH="$PATH":`pwd`/flutter-sdk/bin/cache/dart-sdk/bin/ echo $PATH # Fetch dependencies From 10bbb8762bd826f50b639ee2f559c3e50c5f1dd8 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 16:26:24 -0500 Subject: [PATCH 07/13] flutter --- .github/workflows/flutter-prep.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index cb565b0ae38..dd27206a078 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -75,9 +75,10 @@ jobs: - name: Generate Mocks run: | pushd tool/ - flutter pub get + ./flutter-sdk/bin/flutter pub get popd export PATH="$PATH":`pwd`/flutter-sdk/bin/cache/dart-sdk/bin/ + echo $PATH # Fetch dependencies ./tool/bin/devtools_tool pub-get --only-main From d2f77c6dd9787da873ee721629a8def6e70e5b1b Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 16:33:23 -0500 Subject: [PATCH 08/13] better path --- .github/workflows/flutter-prep.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index dd27206a078..8bdc185cb67 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -74,10 +74,10 @@ jobs: - name: Generate Mocks run: | - pushd tool/ - ./flutter-sdk/bin/flutter pub get - popd export PATH="$PATH":`pwd`/flutter-sdk/bin/cache/dart-sdk/bin/ + export PATH="$PATH":`pwd`/flutter-sdk/bin/ + + flutter pub get echo $PATH # Fetch dependencies From 2a6b44849a793505ae0787ac75d956d9f0a27b89 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 16:46:30 -0500 Subject: [PATCH 09/13] oops pushd tool --- .github/workflows/flutter-prep.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 8bdc185cb67..7b71093eeee 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -77,12 +77,15 @@ jobs: export PATH="$PATH":`pwd`/flutter-sdk/bin/cache/dart-sdk/bin/ export PATH="$PATH":`pwd`/flutter-sdk/bin/ + pushd tool flutter pub get + popd echo $PATH # Fetch dependencies ./tool/bin/devtools_tool pub-get --only-main + # Generate code. ./tool/bin/devtools_tool generate-code - name: Cache Mocks From 9d22ebd6f0c770788aec8d351a6e3a85355b2001 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 16:50:54 -0500 Subject: [PATCH 10/13] github_sha --- .github/workflows/flutter-prep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 7b71093eeee..eecbb934153 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -93,4 +93,4 @@ jobs: with: path: | ./packages/**mocks** - key: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${GITHUB_SHA} + key: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${{GITHUB_SHA}} From ee9635a2307d0205b34ddf3eacb305fb0c875369 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 16:54:05 -0500 Subject: [PATCH 11/13] env_var mock cache key --- .github/workflows/flutter-prep.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index eecbb934153..30c1fc4eac5 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -3,7 +3,8 @@ # found in the LICENSE file. name: Flutter SDK prep - +env: + MOCK_CACHE_KEY: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${{GITHUB_SHA}} on: workflow_call: inputs: @@ -15,6 +16,9 @@ on: latest_flutter_candidate: description: "The latest Flutter candidate version." value: ${{ jobs.reusable-flutter-prep.outputs.latest_flutter_candidate }} + mock_cache_key: + description: "The key used to cache the mocks" + value: ${{MOCK_CACHE_KEY}} jobs: reusable-flutter-prep: @@ -93,4 +97,4 @@ jobs: with: path: | ./packages/**mocks** - key: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${{GITHUB_SHA}} + key: ${{MOCK_CACHE_KEY}} From 53b361d8910ddb07e9bad2dc2d4250bd3165b80c Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 15 Nov 2023 16:57:15 -0500 Subject: [PATCH 12/13] env. --- .github/workflows/flutter-prep.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 30c1fc4eac5..02b004a19f0 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -4,7 +4,7 @@ name: Flutter SDK prep env: - MOCK_CACHE_KEY: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${{GITHUB_SHA}} + MOCK_CACHE_KEY: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${{env.GITHUB_SHA}} on: workflow_call: inputs: @@ -18,7 +18,7 @@ on: value: ${{ jobs.reusable-flutter-prep.outputs.latest_flutter_candidate }} mock_cache_key: description: "The key used to cache the mocks" - value: ${{MOCK_CACHE_KEY}} + value: ${{env.MOCK_CACHE_KEY}} jobs: reusable-flutter-prep: @@ -97,4 +97,4 @@ jobs: with: path: | ./packages/**mocks** - key: ${{MOCK_CACHE_KEY}} + key: ${{env.MOCK_CACHE_KEY}} From 8ee43a3cb351e594eb27be234c829f9e1268f01c Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Thu, 16 Nov 2023 13:12:24 -0500 Subject: [PATCH 13/13] another 1 --- .github/workflows/flutter-prep.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flutter-prep.yaml b/.github/workflows/flutter-prep.yaml index 02b004a19f0..068c4f14a36 100644 --- a/.github/workflows/flutter-prep.yaml +++ b/.github/workflows/flutter-prep.yaml @@ -3,8 +3,6 @@ # found in the LICENSE file. name: Flutter SDK prep -env: - MOCK_CACHE_KEY: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${{env.GITHUB_SHA}} on: workflow_call: inputs: @@ -18,7 +16,7 @@ on: value: ${{ jobs.reusable-flutter-prep.outputs.latest_flutter_candidate }} mock_cache_key: description: "The key used to cache the mocks" - value: ${{env.MOCK_CACHE_KEY}} + value: ${{ steps.determine-mocks-cache-id.outputs.mocks_cache_id}} jobs: reusable-flutter-prep: @@ -75,7 +73,11 @@ jobs: ./flutter-sdk/bin/flutter config --no-analytics ./flutter-sdk/bin/flutter doctor ./flutter-sdk/bin/cache/dart-sdk/bin/dart --disable-analytics - + - name: Determine Mocks Cache Id + id: determine-mocks-cache-id + run: echo "mocks_cache_id=$MOCKS_CACHE_ID" >> "GITHUB_OUTPUT" + env: + MOCKS_CACHE_ID: mocks-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}-${{env.GITHUB_SHA}} - name: Generate Mocks run: | export PATH="$PATH":`pwd`/flutter-sdk/bin/cache/dart-sdk/bin/