Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into feat/add_noarch_config
Browse files Browse the repository at this point in the history
  • Loading branch information
baszalmstra committed Dec 3, 2024
2 parents badc52e + eaddfd0 commit 5ea7343
Show file tree
Hide file tree
Showing 11 changed files with 2,179 additions and 1,064 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Pre-commit

on:
push:
branches: [ "main" ]
pull_request:

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up pixi
uses: prefix-dev/[email protected]
with:
environments: lint
- name: pre-commit
run: pixi run pre-commit-run --color=always --show-diff-on-failure
4 changes: 2 additions & 2 deletions .github/workflows/rattler-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
TARGET_PLATFORM: ${{ matrix.target }}
RECIPE_VERSION: ${{ needs.generate_version.outputs.version }}
RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION: "true"
RATTLER_BUILD_COLOR: "always"
RATTLER_BUILD_COLOR: "always"
run: |
pixi r -e build-self rattler-build build --recipe recipe/recipe.yaml --output-dir=$RUNNER_TEMP --target-platform=${{ env.TARGET_PLATFORM }} --experimental --test native
- name: Upload all packages
Expand All @@ -65,7 +65,7 @@ jobs:
if: github.event_name == 'push' && matrix.os != 'windows-latest'
run: |
# ignore errors because we want to ignore duplicate packages
for file in $RUNNER_TEMP/**/*.conda; do
for file in "$RUNNER_TEMP"/**/*.conda; do
echo "Uploading ${file}"
pixi r -e build-self rattler-build upload prefix -c pixi-build-backends "$file"
done
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Run rustfmt
uses: actions-rust-lang/rustfmt@v1
- name: Run clippy
run: cargo clippy --all-targets
run: cargo clippy --all-targets --workspace

test:
name: Test
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:

- name: Run tests
run: >
cargo nextest run --workspace
cargo nextest run --workspace --all-targets
- name: Run doctests
run: >
Expand Down
40 changes: 40 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
exclude: (^.pixi/|.snap)
repos:
- repo: local
hooks:
- id: check-yaml
name: check-yaml
entry: pixi run -e lint check-yaml
language: system
types: [yaml]
- id: end-of-file
name: end-of-file
entry: pixi run -e lint end-of-file-fixer
language: system
types: [text]
stages: [pre-commit, pre-push, manual]
- id: trailing-whitespace
name: trailing-whitespace
entry: pixi run -e lint trailing-whitespace-fixer
language: system
types: [text]
stages: [pre-commit, pre-push, manual]
# GitHub Actions
- id: actionlint
name: Lint GitHub Actions workflow files
language: system
entry: pixi run -e lint actionlint
types: [yaml]
files: ^\.github/workflows/
# typos
- id: typos
name: typos
entry: pixi run -e lint typos --write-changes --force-exclude
language: system
types: [text]
# TOML format
- id: taplo
name: taplo
entry: pixi run -e lint toml-format
language: system
types: [file, toml]
88 changes: 44 additions & 44 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ chrono = "0.4.38"
clap = "4.5.20"
clap-verbosity-flag = "3.0.1"
fs-err = "3.0.0"
indexmap = "2.6.0"
indexmap = "2.7.0"
itertools = "0.13.0"
log = "0.4.22"
miette = "7.4.0"
Expand All @@ -24,7 +24,7 @@ serde_yaml = "0.9"
serde_json = "1.0"
tempfile = "3.10.1"
tokio = "1.37.0"
tracing-subscriber = "0.3.18"
tracing-subscriber = "0.3.19"
url = "2.5.4"

jsonrpc-stdio-server = "18.0.0"
Expand Down
Loading

0 comments on commit 5ea7343

Please sign in to comment.