Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
barrbrain committed Nov 28, 2023
2 parents 9b8cb64 + 40b444b commit 5deb4e3
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 56 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ jobs:
# "cargo build" command to "cargo cinstall"
CROSS_BUILD_DOCKERFILE: ./cross/Dockerfile.libs
CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_RUSTFLAGS:
"-C target-feature=+crt-static"
"-C target-feature=-crt-static"
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS:
"-C target-feature=+crt-static"
"-C target-feature=-crt-static"
run: |
cp ~/.cargo/bin/cargo-c* $(dirname $(rustup which cargo))
cross build --target ${{ matrix.target }} --profile release-strip
Expand All @@ -265,7 +265,7 @@ jobs:
if: matrix.build == 'sdk' && matrix.target == 'x86_64-unknown-linux-musl'
env:
RUSTFLAGS:
"-C target-feature=+crt-static -C target-cpu=${{ matrix.target_cpu }}"
"-C target-feature=-crt-static -C target-cpu=${{ matrix.target_cpu }}"
run: |
cargo cinstall --target ${{ matrix.target }} \
--prefix dist \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rav1e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
tar xj -C $HOME/.cargo/bin
- name: Install Intel SDE
if: matrix.conf == 'grcov-codecov'
uses: petarpetrovt/setup-sde@v2.2
uses: petarpetrovt/setup-sde@v2.3
- name: Install ${{ matrix.toolchain }}
uses: dtolnay/rust-toolchain@master
with:
Expand Down
117 changes: 68 additions & 49 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ dump_lookahead_data = ["byteorder", "image"]
arg_enum_proc_macro = "0.3.4"
bitstream-io = "1"
cfg-if = "1.0"
clap = { version = "4.4.8", optional = true, default-features = false, features = [
clap = { version = "4.4.9", optional = true, default-features = false, features = [
"color",
"std",
"wrap_help",
Expand Down Expand Up @@ -104,9 +104,9 @@ byteorder = { version = "1.5.0", optional = true }
log = "0.4"
console = { version = "0.15", optional = true }
fern = { version = "0.6", optional = true }
itertools = "0.11"
itertools = "0.12"
simd_helpers = "0.1"
wasm-bindgen = { version = "0.2.88", optional = true }
wasm-bindgen = { version = "0.2.89", optional = true }
nom = { version = "7.1.3", optional = true }
new_debug_unreachable = "1.0.4"
once_cell = "1.18.0"
Expand Down

0 comments on commit 5deb4e3

Please sign in to comment.