Skip to content

Commit

Permalink
Merge branch 'main' into feat/test-harness
Browse files Browse the repository at this point in the history
  • Loading branch information
tdejager committed Jun 26, 2023
2 parents 684a351 + 27b7a52 commit 2ea2930
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 28 deletions.
30 changes: 11 additions & 19 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,10 @@ jobs:
- { name: "macOS-x86_64", target: x86_64-apple-darwin, os: macOS-latest }
- { name: "macOS-aarch64", target: aarch64-apple-darwin, os: macOS-latest, skip-tests: true }

- { name: "Windows-x86_64", target: x86_64-pc-windows-msvc, os: windows-latest }
include:
- os: windows-latest
rustflags: -C target-feature=+crt-static
- { name: "Windows-x86_64", target: x86_64-pc-windows-msvc, os: windows-latest, rustflags: -C target-feature=+crt-static }
env:
BUILD_CMD: cargo # The build and test command to use if not overwritten
RUSTFLAGS: ${{ matrix.rustflags || '' }} -D warnings
RUSTFLAGS: ${{ matrix.job.rustflags || '' }} -D warnings
steps:
- name: Checkout source code
uses: actions/checkout@v3
Expand Down Expand Up @@ -169,6 +166,13 @@ jobs:
unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi
echo "IS_RELEASE=${IS_RELEASE}" >> $GITHUB_OUTPUT
- name: Set release specific compilation flags
if: steps.is-release.outputs.IS_RELEASE
shell: bash
run: |
echo "CARGO_PROFILE_RELEASE_LTO=true" >> $GITHUB_ENV
echo "CARGO_PROFILE_RELEASE_STRIP=true" >> $GITHUB_ENV
- name: Set build options
id: build-options
shell: bash
Expand All @@ -179,25 +183,14 @@ jobs:
*) CARGO_BUILD_OPTIONS="" ;;
esac
if [[ '${{ steps.is-release.outputs.IS_RELEASE }}' == 'true' ]]; then
CARGO_BUILD_OPTIONS="${CARGO_BUILD_OPTIONS} --profile=release-lto"
BUILD_TARGET_FOLDER="release-lto"
else
CARGO_BUILD_OPTIONS="${CARGO_BUILD_OPTIONS} --release"
BUILD_TARGET_FOLDER="release"
fi
echo "BUILD_TARGET_FOLDER=${BUILD_TARGET_FOLDER}" >> $GITHUB_OUTPUT
echo "CARGO_BUILD_OPTIONS=${CARGO_BUILD_OPTIONS}" >> $GITHUB_OUTPUT
- name: Build
uses: actions-rs/cargo@v1
env:
BUILD_PROFILE: ${{ steps.is-release.outputs.IS_RELEASE && '--profile release-lto' || '--release' }}
with:
use-cross: ${{ matrix.job.use-cross }}
command: build
args: --locked --target=${{ matrix.job.target }} ${{ steps.build-options.outputs.CARGO_BUILD_OPTIONS}}
args: --locked --release --target=${{ matrix.job.target }} ${{ steps.build-options.outputs.CARGO_BUILD_OPTIONS}}

- name: Set binary name & path
id: bin
Expand All @@ -210,9 +203,8 @@ jobs:
esac;
# Setup paths
BUILD_TARGET_FOLDER="${{ steps.build-options.outputs.BUILD_TARGET_FOLDER }}"
BIN_NAME="${{ needs.crate_metadata.outputs.name }}${EXE_SUFFIX}"
BIN_PATH="target/${{ matrix.job.target }}/${BUILD_TARGET_FOLDER}/${BIN_NAME}"
BIN_PATH="target/${{ matrix.job.target }}/release/${BIN_NAME}"
# Let subsequent steps know where to find the binary
echo "BIN_PATH=${BIN_PATH}" >> $GITHUB_OUTPUT
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [0.0.5] - 2023-06-26

Fixing Windows installer build in CI. ([#145](https://github.com/prefix-dev/pixi/pull/145))

## [0.0.4] - 2023-06-26

### Highlights
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

7 changes: 1 addition & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pixi"
version = "0.0.4"
version = "0.0.5"
description = "A package management and workflow tool"
edition = "2021"
authors = ["pixi contributors <hi@prefix.dev>"]
Expand Down Expand Up @@ -57,8 +57,3 @@ toml_edit = { version = "0.19.10", features = ["serde"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
url = "2.4.0"

[profile.release-lto]
inherits = "release"
lto = true
strip = true
4 changes: 2 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "pixi"
version = "0.0.4"
description = "Package manamgent made easy!"
version = "0.0.5"
description = "Package management made easy!"
authors = ["Wolf Vollprecht <wolf@prefix.dev>", "Bas Zalmstra <bas@prefix.dev>", "Tim de Jager <tim@prefix.dev>", "Ruben Arts <ruben@prefix.dev>"]
channels = ["conda-forge"]
platforms = ["linux-64", "win-64", "osx-64", "osx-arm64"]
Expand Down

0 comments on commit 2ea2930

Please sign in to comment.