Skip to content

Commit

Permalink
Merge branch 'master' into native-event-type
Browse files Browse the repository at this point in the history
  • Loading branch information
archseer committed Aug 9, 2022
2 parents bcdd44f + 4ce5a94 commit f73a887
Show file tree
Hide file tree
Showing 119 changed files with 4,576 additions and 1,940 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Auto detect text files and perform normalization
* text=auto

*.rs text diff=rust
*.toml text diff=toml

*.scm text diff=scheme
*.md text diff=markdown

book/theme/highlight.js linguist-vendored
Cargo.lock text
13 changes: 8 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ jobs:
rust: stable
target: x86_64-pc-windows-msvc
cross: false
# - build: aarch64-macos
# os: macos-latest
# rust: stable
# target: aarch64-apple-darwin
- build: aarch64-macos
os: macos-latest
rust: stable
target: aarch64-apple-darwin
cross: false
skip_tests: true # x86_64 host can't run aarch64 code
# - build: x86_64-win-gnu
# os: windows-2019
# rust: stable-x86_64-gnu
Expand Down Expand Up @@ -100,6 +102,7 @@ jobs:

- name: Run cargo test
uses: actions-rs/cargo@v1
if: "!matrix.skip_tests"
with:
use-cross: ${{ matrix.cross }}
command: test
Expand All @@ -113,7 +116,7 @@ jobs:
args: --release --locked --target ${{ matrix.target }}

- name: Strip release binary (linux and macos)
if: matrix.build == 'x86_64-linux' || matrix.build == 'x86_64-macos'
if: matrix.build == 'x86_64-linux' || endsWith(matrix.build, 'macos')
run: strip "target/${{ matrix.target }}/release/hx"

- name: Strip release binary (arm)
Expand Down
5 changes: 5 additions & 0 deletions .ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Things that we don't want ripgrep to search that we do want in git
# https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#automatic-filtering

# Minified JS vendored from mdbook
book/theme/highlight.js
Loading

0 comments on commit f73a887

Please sign in to comment.