Skip to content

Commit

Permalink
Merge branch 'Byron:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
kz6fittycent authored Dec 19, 2023
2 parents b586b79 + 0fe20e8 commit b013548
Show file tree
Hide file tree
Showing 185 changed files with 2,564 additions and 524 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**/generated-archives/*.tar.xz filter=lfs diff=lfs merge=lfs -text
**/generated-archives/*.tar.xz filter=lfs-disabled diff=lfs merge=lfs -text

# assure line feeds don't interfere with our working copy hash
**/tests/fixtures/**/*.sh text crlf=input eol=lf
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ jobs:
- name: "cargo check default features"
if: startsWith(matrix.os, 'windows')
run: cargo check --all --bins --examples
- run: git lfs fetch && git lfs checkout
- run: |
# it should never be a failure not to get the caches, as they can be regenerated.
git lfs fetch && git lfs checkout || true
- uses: taiki-e/install-action@v1
with:
tool: nextest
Expand All @@ -91,7 +93,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
target: [ i686-unknown-linux-gnu, armv7-linux-androideabi ]
target: [ armv7-linux-androideabi ]
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
Expand Down
Loading

0 comments on commit b013548

Please sign in to comment.