Skip to content

Commit 1484ddf

Browse files
authored
feat: Bump rattler, introduce offline mode for pixi-unpack (#323)
1 parent ef3ad69 commit 1484ddf

6 files changed

Lines changed: 253 additions & 375 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,14 @@ jobs:
7272
key: build-${{ matrix.target }}-${{ matrix.os }}
7373

7474
- name: Build
75+
env:
76+
# GCC on aarch64 defaults to outline atomics, emitting calls to
77+
# __aarch64_*_sync helpers that live in libgcc. Static musl builds link
78+
# with -nodefaultlibs, so those symbols are unresolved (libdbus-sys, a C
79+
# dependency of rattler's keyring backend, hits this). Inline the atomics.
80+
CFLAGS_aarch64_unknown_linux_musl: -mno-outline-atomics
7581
run: |
76-
cargo build --profile release --locked --color always${{ endsWith(matrix.target, 'musl') && ' --no-default-features --features rustls-tls' || '' }} --target ${{ matrix.target }} --bins
82+
cargo build --profile release --locked --color always${{ endsWith(matrix.target, 'musl') && ' --no-default-features --features rustls' || '' }} --target ${{ matrix.target }} --bins
7783
mv target/${{ matrix.target }}/release/pixi-pack${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} pixi-pack-${{ matrix.target }}${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }}
7884
mv target/${{ matrix.target }}/release/pixi-unpack${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} pixi-unpack-${{ matrix.target }}${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }}
7985

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ jobs:
6969
with:
7070
key: tests
7171
- name: Run test
72-
run: pixi run test --color always${{ startsWith(matrix.os, 'ubuntu') && ' --no-default-features --features rustls-tls' || '' }}
72+
run: pixi run test --color always${{ startsWith(matrix.os, 'ubuntu') && ' --no-default-features --features rustls' || '' }}

0 commit comments

Comments
 (0)