Skip to content

Commit

Permalink
Merge branch 'main' into feat/add-pypi-index
Browse files Browse the repository at this point in the history
  • Loading branch information
tdejager authored Nov 18, 2024
2 parents 17ccc6b + 3cda60d commit 026d4a6
Show file tree
Hide file tree
Showing 256 changed files with 8,028 additions and 4,119 deletions.
63 changes: 26 additions & 37 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
workspaces: ". -> target-pixi"
key: ${{ hashFiles('pixi.lock') }}
- name: Test pixi
run: pixi run test-workspace
run: pixi run test-slow

build:
name: Build Binary | ${{ matrix.name }}
Expand All @@ -146,30 +146,24 @@ jobs:
fail-fast: false
matrix:
include:
- {
name: "Linux-x86_64",
target: x86_64-unknown-linux-musl,
os: "${{ contains(github.event.pull_request.labels.*.name, 'ci:free') && 'ubuntu-latest' || '8core_ubuntu_latest_runner' }}"
}
- {
name: "Linux-aarch64",
target: aarch64-unknown-linux-musl,
os: ubuntu-latest,
}

- { name: "macOS-x86", target: x86_64-apple-darwin, os: macos-13 }
- { name: "macOS-arm", target: aarch64-apple-darwin, os: macos-14 } # macOS-14 is the ARM chipset

- {
name: "Windows",
target: x86_64-pc-windows-msvc,
os: "${{ contains(github.event.pull_request.labels.*.name, 'ci:free') && 'windows-latest' || '16core_windows_latest_runner' }}"
}
- {
name: "Windows-arm",
target: aarch64-pc-windows-msvc,
os: windows-latest,
}
- name: "Linux-x86_64"
target: x86_64-unknown-linux-musl
os: "${{ contains(github.event.pull_request.labels.*.name, 'ci:free') && 'ubuntu-latest' || '8core_ubuntu_latest_runner' }}"
- name: "Linux-aarch64"
target: aarch64-unknown-linux-musl
os: ubuntu-latest
- name: "macOS-x86"
target: x86_64-apple-darwin
os: macos-13
- name: "macOS-arm"
target: aarch64-apple-darwin
os: macos-14
- name: "Windows"
target: x86_64-pc-windows-msvc
os: "${{ contains(github.event.pull_request.labels.*.name, 'ci:free') && 'windows-latest' || '16core_windows_latest_runner' }}"
- name: "Windows-arm"
target: aarch64-pc-windows-msvc
os: windows-latest
env:
#
# These are some environment variables that configure the build so that the binary size is reduced.
Expand Down Expand Up @@ -209,12 +203,6 @@ jobs:
# cargo-wix does not require static crt
RUSTFLAGS: ""

- name: Ensure cache directory exists
shell: bash
if: matrix.os == 'ubuntu-20.04' && matrix.use-cross
run: |
mkdir -p ${XDG_CACHE_HOME}
- name: Show version information (Rust, cargo, GCC)
shell: bash
run: |
Expand Down Expand Up @@ -270,10 +258,11 @@ jobs:
BIN_PATH="target/${{ matrix.target }}/${CARGO_PROFILE}/${BIN_NAME}"
# Let subsequent steps know where to find the binary
echo "BIN_PATH=${BIN_PATH}" >> $GITHUB_OUTPUT
echo "BIN_NAME=${BIN_NAME}" >> $GITHUB_OUTPUT
echo "EXE_SUFFIX=${EXE_SUFFIX}" >> $GITHUB_OUTPUT
{
echo "BIN_PATH=${BIN_PATH}"
echo "BIN_NAME=${BIN_NAME}"
echo "EXE_SUFFIX=${EXE_SUFFIX}"
} >> $GITHUB_OUTPUT
- name: Build msi Installer
if: startsWith(matrix.name, 'Windows') && matrix.target != 'aarch64-pc-windows-msvc'
run: >
Expand Down Expand Up @@ -309,7 +298,8 @@ jobs:
KEYCHAIN_PATH="$RUNNER_TEMP/$KEYCHAIN_FILENAME"
# create temporary keychain
export KEYCHAIN_PASSWORD=$(openssl rand -base64 32)
KEYCHAIN_PASSWORD=$(openssl rand -base64 32)
export KEYCHAIN_PASSWORD
security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
Expand Down Expand Up @@ -339,7 +329,6 @@ jobs:
# notarize binary
xcrun notarytool submit pixi.zip --keychain-profile "$KEYCHAIN_ENTRY" --wait
- name: Create tarball
id: package
shell: bash
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/test_common_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ jobs:
matrix:
arch:
# Linux
- {
target: x86_64-unknown-linux-musl,
os: 8core_ubuntu_latest_runner,
name: "Linux",
}
- target: x86_64-unknown-linux-musl
os: 8core_ubuntu_latest_runner
name: "Linux"
# MacOS
- { target: x86_64-apple-darwin, os: macos-13, name: "MacOS-x86" }
- { target: aarch64-apple-darwin, os: macos-14, name: "MacOS-Arm" } # macOS-14 is the ARM chipset
- target: x86_64-apple-darwin
os: macos-13
name: "MacOS-x86"
- target: aarch64-apple-darwin
os: macos-14
name: "MacOS-Arm" # macOS-14 is the ARM chipset
# Windows
- {
target: x86_64-pc-windows-msvc,
os: windows-latest,
extension: .exe,
name: "Windows",
}
- target: x86_64-pc-windows-msvc
os: windows-latest
extension: .exe
name: "Windows"
steps:
- name: Checkout repo
uses: actions/checkout@v4
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/test_downstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ jobs:
matrix:
arch:
# Linux
- {
target: x86_64-unknown-linux-musl,
os: 8core_ubuntu_latest_runner,
name: "Linux",
}
- target: x86_64-unknown-linux-musl
os: 8core_ubuntu_latest_runner
name: "Linux"
# MacOS
- { target: x86_64-apple-darwin, os: macos-13, name: "MacOS-x86" }
- { target: aarch64-apple-darwin, os: macos-14, name: "MacOS-Arm" } # macOS-14 is the ARM chipset
- target: x86_64-apple-darwin
os: macos-13
name: "MacOS-x86"
- target: aarch64-apple-darwin
os: macos-14
name: "MacOS-Arm" # macOS-14 is the ARM chipset
# Windows
- {
target: x86_64-pc-windows-msvc,
os: windows-latest,
extension: .exe,
name: "Windows",
}
- target: x86_64-pc-windows-msvc
os: windows-latest
extension: .exe
name: "Windows"
repository:
- Deltares/Ribasim
- quantco/polarify
Expand Down
128 changes: 61 additions & 67 deletions .github/workflows/test_exports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,72 +3,66 @@ name: "Test exports"
on:
workflow_call:


jobs:
test-export:
name: ${{ matrix.arch.name }} - Export Tests
runs-on: ${{ matrix.arch.os }}
strategy:
fail-fast: false
matrix:
arch:
# Linux
- {
target: x86_64-unknown-linux-musl,
os: ubuntu-20.04,
name: "Linux",
}
# MacOS
- { target: x86_64-apple-darwin, os: macos-13, name: "MacOS-x86" }
- { target: aarch64-apple-darwin, os: macos-14, name: "MacOS-arm" } # macOS-14 is the ARM chipset
# # Windows
# - {
# target: x86_64-pc-windows-msvc,
# os: windows-latest,
# extension: .exe,
# name: "Windows",
# }
steps:
- name: checkout repo
uses: actions/checkout@v4
- name: setup micromamba
uses: mamba-org/[email protected]
- name: Download binary from build
uses: actions/download-artifact@v4
with:
name: pixi-${{ matrix.arch.target }}${{ matrix.arch.extension }}
path: pixi_bin
- name: Debug
run: |
pwd
- name: Setup unix binary, add to github path
if: matrix.arch.name != 'Windows'
run: |
mv pixi_bin/pixi-${{ matrix.arch.target }} pixi_bin/pixi
chmod a+x pixi_bin/pixi
echo "$(pwd)/pixi_bin" >> $GITHUB_PATH
- name: Create Directory and Move Executable
if: matrix.arch.name == 'Windows' && matrix.arch.target == 'x86_64-pc-windows-msvc'
run: |
New-Item -ItemType Directory -Force -Path "D:\.pixi"
Move-Item -Path "pixi_bin/pixi-${{ matrix.arch.target }}${{ matrix.arch.extension }}" -Destination "D:\.pixi\pixi.exe"
shell: pwsh
- name: Add to PATH
if: matrix.arch.name == 'Windows' && matrix.arch.target == 'x86_64-pc-windows-msvc'
run: echo "D:\.pixi" | Out-File -Append -Encoding utf8 -FilePath $env:GITHUB_PATH
test-export:
name: ${{ matrix.arch.name }} - Export Tests
runs-on: ${{ matrix.arch.os }}
strategy:
fail-fast: false
matrix:
arch:
# Linux
- target: x86_64-unknown-linux-musl
os: ubuntu-20.04
name: "Linux"
# MacOS
- target: x86_64-apple-darwin
os: macos-13
name: "MacOS-x86"
- target: aarch64-apple-darwin
os: macos-14
name: "MacOS-arm" # macOS-14 is the ARM chipset
steps:
- name: checkout repo
uses: actions/checkout@v4
- name: setup micromamba
uses: mamba-org/[email protected]
- name: Download binary from build
uses: actions/download-artifact@v4
with:
name: pixi-${{ matrix.arch.target }}
path: pixi_bin
- name: Debug
run: |
pwd
- name: Setup unix binary, add to github path
if: matrix.arch.name != 'Windows'
run: |
mv pixi_bin/pixi-${{ matrix.arch.target }} pixi_bin/pixi
chmod a+x pixi_bin/pixi
echo "$(pwd)/pixi_bin" >> $GITHUB_PATH
- name: Create Directory and Move Executable
if: matrix.arch.name == 'Windows' && matrix.arch.target == 'x86_64-pc-windows-msvc'
run: |
New-Item -ItemType Directory -Force -Path "D:\.pixi"
Move-Item -Path "pixi_bin/pixi-${{ matrix.arch.target }}" -Destination "D:\.pixi\pixi.exe"
shell: pwsh
- name: Add to PATH
if: matrix.arch.name == 'Windows' && matrix.arch.target == 'x86_64-pc-windows-msvc'
run: echo "D:\.pixi" | Out-File -Append -Encoding utf8 -FilePath $env:GITHUB_PATH
shell: pwsh
- name: Verify and Use Executable
if: matrix.arch.name == 'Windows' && matrix.arch.target == 'x86_64-pc-windows-msvc'
run: |
echo "Current PATH: $env:PATH"
pixi --version
shell: pwsh
- name: Verify and Use Executable
if: matrix.arch.name == 'Windows' && matrix.arch.target == 'x86_64-pc-windows-msvc'
run: |
echo "Current PATH: $env:PATH"
pixi --version
shell: pwsh
- name: Help
run: pixi --help
- name: Info
run: pixi info
- name: Install pixi
run: pixi install -v
- name: Test export
shell: bash
run: pixi run test-export
- name: Help
run: pixi --help
- name: Info
run: pixi info
- name: Install pixi
run: pixi install -v
- name: Test export
shell: bash
run: pixi run test-export
Loading

0 comments on commit 026d4a6

Please sign in to comment.