Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor LFS handling #881

Merged
merged 2 commits into from
Mar 5, 2025
Merged

Refactor LFS handling #881

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f847e82
Refactor LFS handling
DJMcNab Mar 5, 2025
d4dca3e
Remove globstar assumption
DJMcNab Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ env:
ANDROID_TARGETS: "-p xilem --example mason_android --example calc_android --example stopwatch_android --example variable_clock_android --example http_cats_android --example to_do_mvc_android"
# Whether the workspace contains Rust code using the debug_assertions configuration option.
USING_DEBUG_ASSERTIONS: "true"
# The files stored in LFS the tests need to access
LFS_FILES: "masonry/src/**/screenshots/*.png"


# Rationale
Expand Down Expand Up @@ -206,23 +208,29 @@ jobs:
name: Prime LFS Cache
runs-on: ubuntu-latest
continue-on-error: true
outputs:
lfs-hash: ${{ steps.calc-hash.outputs.result }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- id: calc-hash
name: Calculate LFS hash
run: echo "result=${{ hashFiles(env.LFS_FILES) }}" | tee -a "$GITHUB_OUTPUT"

- name: Cache git LFS
id: lfs-cache
uses: actions/cache@v4
with:
path: .git/lfs
# The files stored in git lfs are all in this folder
key: masonry-lfs-${{ hashFiles('masonry/src/**/screenshots/*.png') }}
key: masonry-lfs-${{ steps.calc-hash.outputs.result }}
restore-keys: masonry-lfs-
enableCrossOsArchive: true

- name: Fetch LFS data
if: ${{ steps.lfs-cache.outputs.cache-hit != 'true' }}
run: git lfs fetch
run: git lfs fetch --include '${{ env.LFS_FILES }}'

test-stable:
name: cargo test
Expand Down Expand Up @@ -251,11 +259,11 @@ jobs:
with:
path: .git/lfs
# The files stored in git lfs are all in this folder
key: masonry-lfs-${{ hashFiles('masonry/src/**/screenshots/*.png') }}
key: masonry-lfs-${{ needs.prime-lfs-cache.outputs.lfs-hash }}
enableCrossOsArchive: true

- name: Checkout LFS files
run: git lfs checkout
run: git lfs checkout '${{ env.LFS_FILES }}'
continue-on-error: true

- name: Install Rust ${{ env.RUST_STABLE_VER }}
Expand Down