Skip to content

Commit

Permalink
Merge branch 'master' into feature/heif
Browse files Browse the repository at this point in the history
  • Loading branch information
woelper committed Nov 28, 2023
2 parents c7b566e + 4667190 commit 2261da8
Show file tree
Hide file tree
Showing 9 changed files with 380 additions and 258 deletions.
8 changes: 8 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# [build]
# rustflags = ["-C", "link-arg=-fuse-ld=lld"]

# [profile.dev]
# lto = "off"

[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
1 change: 1 addition & 0 deletions .github/workflows/check_arm7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v2

- name: Update Rust
run: rustup update
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/check_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: ilammy/setup-nasm@v1
- uses: Swatinem/rust-cache@v2





# - name: cargo build
# run: cargo build

- name: Check without default features
run: cargo check --no-default-features
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/check_ubuntu_no_default_features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: ilammy/setup-nasm@v1
- uses: Swatinem/rust-cache@v2


- name: Patch azure linux deps
run: sudo apt update
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/check_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: ilammy/setup-nasm@v1

- uses: Swatinem/rust-cache@v2

- name: Install vcpkg
run: vcpkg integrate install

Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@ perf.*
flamegraph.svg
.notes
TODO
# for dev profile optimisations
.cargo/config.toml
debug.png
Loading

0 comments on commit 2261da8

Please sign in to comment.