From c93470ce72ca631eefba6442fa4efa5b590ce85d Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Tue, 7 Jan 2025 16:27:05 +0100 Subject: [PATCH 1/3] add cmake compile commands (#51) --- crates/pixi-build/src/bin/pixi-build-cmake/build_script.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/pixi-build/src/bin/pixi-build-cmake/build_script.j2 b/crates/pixi-build/src/bin/pixi-build-cmake/build_script.j2 index 1e7369d..ac28fb9 100644 --- a/crates/pixi-build/src/bin/pixi-build-cmake/build_script.j2 +++ b/crates/pixi-build/src/bin/pixi-build-cmake/build_script.j2 @@ -8,6 +8,7 @@ if not exist %SRC_DIR%\..\build\CMakeCache.txt ( -GNinja ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ^ -DBUILD_SHARED_LIBS=ON ^ -B %SRC_DIR%\..\build ^ -S "{{ source_dir }}" @@ -23,6 +24,7 @@ if [ ! -f "$SRC_DIR/../build/CMakeCache.txt" ]; then -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DBUILD_SHARED_LIBS=ON \ -B $SRC_DIR/../build \ -S "{{ source_dir }}" From 3e72dceecbdc5da8f647f5ea8c767cae48316153 Mon Sep 17 00:00:00 2001 From: Tim de Jager Date: Thu, 9 Jan 2025 13:16:06 +0100 Subject: [PATCH 2/3] feat: back to main branches as the refactor branch has been merged --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28cae7a..fc775fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "fancy_display" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "console", ] @@ -3098,7 +3098,7 @@ dependencies = [ [[package]] name = "pixi_build_types" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "rattler_conda_types", "serde", @@ -3109,7 +3109,7 @@ dependencies = [ [[package]] name = "pixi_config" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "clap", "console", @@ -3134,7 +3134,7 @@ dependencies = [ [[package]] name = "pixi_consts" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "console", "rattler_cache", @@ -3145,7 +3145,7 @@ dependencies = [ [[package]] name = "pixi_git" version = "0.0.1" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "dashmap", "dunce", @@ -3166,7 +3166,7 @@ dependencies = [ [[package]] name = "pixi_manifest" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "console", "dunce", @@ -3200,7 +3200,7 @@ dependencies = [ [[package]] name = "pixi_spec" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "dirs", "file_url 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3222,7 +3222,7 @@ dependencies = [ [[package]] name = "pixi_toml" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "digest", "hex", @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "pixi_utils" version = "0.1.0" -source = "git+https://github.com/baszalmstra/pixi?branch=refactor/package_everything#9172b28b79ff3f970df0d502d98d96cbd33cdbc9" +source = "git+https://github.com/prefix-dev/pixi?branch=main#7e877c3733447c40ca9b7039e20517e8cd591bb6" dependencies = [ "fd-lock", "fs-err", diff --git a/Cargo.toml b/Cargo.toml index 45529c8..35008ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,10 +38,10 @@ rattler_conda_types = { version = "0.29.1", default-features = false } rattler_package_streaming = { version = "0.22.14", default-features = false } rattler_virtual_packages = { version = "1.1.10", default-features = false } -pixi_build_types = { git = "https://github.com/baszalmstra/pixi", branch = "refactor/package_everything" } -pixi_consts = { git = "https://github.com/baszalmstra/pixi", branch = "refactor/package_everything" } -pixi_manifest = { git = "https://github.com/baszalmstra/pixi", branch = "refactor/package_everything" } -pixi_spec = { git = "https://github.com/baszalmstra/pixi", branch = "refactor/package_everything" } +pixi_build_types = { git = "https://github.com/prefix-dev/pixi", branch = "main" } +pixi_consts = { git = "https://github.com/prefix-dev/pixi", branch = "main" } +pixi_manifest = { git = "https://github.com/prefix-dev/pixi", branch = "main" } +pixi_spec = { git = "https://github.com/prefix-dev/pixi", branch = "main" } [patch.crates-io] rattler = { git = "https://github.com/conda/rattler", branch = "main" } From ae381408ec577d4e4d5c4c341a5e95b0b0b0259f Mon Sep 17 00:00:00 2001 From: Tim de Jager Date: Thu, 9 Jan 2025 15:28:02 +0100 Subject: [PATCH 3/3] feat: install lzma for now until we convert to pixi (#54) --- .github/workflows/rust-compile.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/rust-compile.yml b/.github/workflows/rust-compile.yml index dc4256d..9b633b8 100644 --- a/.github/workflows/rust-compile.yml +++ b/.github/workflows/rust-compile.yml @@ -59,6 +59,12 @@ jobs: components: rustfmt cache: false + - name: Install LZMA and dependencies + if: matrix.os == 'ubuntu-latest' + run: | + sudo apt-get update + sudo apt-get install -y xz-utils liblzma-dev + - uses: Swatinem/rust-cache@v2 - name: Install cargo nextest