Skip to content

Commit

Permalink
Merge branch 'main' into renji/fix-6554
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvestre authored Sep 16, 2024
2 parents 72619bf + 811b32b commit b5eae0f
Show file tree
Hide file tree
Showing 61 changed files with 2,582 additions and 606 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2

style_deps:
## ToDO: [2021-11-10; rivy] 'Style/deps' needs more informative output and better integration of results into the GHA dashboard
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
shell: bash
run: |
RUSTDOCFLAGS="-Dwarnings" cargo doc ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --no-deps --workspace --document-private-items
- uses: DavidAnson/markdownlint-cli2-action@v16
- uses: DavidAnson/markdownlint-cli2-action@v17
with:
fix: "true"
globs: |
Expand Down Expand Up @@ -482,6 +482,7 @@ jobs:
- { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
- { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows }
- { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }
- { os: windows-latest , target: aarch64-pc-windows-msvc , features: feat_os_windows, use-cross: use-cross , skip-tests: true }
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand Down Expand Up @@ -937,7 +938,8 @@ jobs:
job:
- { os: ubuntu-latest , features: unix, toolchain: nightly }
- { os: macos-latest , features: macos, toolchain: nightly }
- { os: windows-latest , features: windows, toolchain: nightly-x86_64-pc-windows-gnu }
# FIXME: Re-enable Code Coverage on windows, which currently fails due to "profiler_builtins". See #6686.
# - { os: windows-latest , features: windows, toolchain: nightly-x86_64-pc-windows-gnu }
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand All @@ -964,9 +966,6 @@ jobs:
# * use requested TOOLCHAIN if specified
if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
outputs TOOLCHAIN
# staging directory
STAGING='_staging'
outputs STAGING
# target-specific options
# * CARGO_FEATURES_OPTION
CARGO_FEATURES_OPTION='--all-features' ; ## default to '--all-features' for code coverage
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
job:
- { os: ubuntu-22.04 , features: unix }
- { os: ubuntu-24.04 , features: unix }
env:
SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache"
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Run sccache-cache
uses: mozilla-actions/[email protected]
- name: Prepare, build and test
uses: vmactions/freebsd-vm@v1.0.8
uses: vmactions/freebsd-vm@v1.1.1
with:
usesh: true
sync: rsync
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
fail-fast: false
matrix:
job:
- { os: ubuntu-22.04 , features: unix }
- { os: ubuntu-24.04 , features: unix }
env:
mem: 4096
SCCACHE_GHA_ENABLED: "true"
Expand All @@ -131,7 +131,7 @@ jobs:
- name: Run sccache-cache
uses: mozilla-actions/[email protected]
- name: Prepare, build and test
uses: vmactions/freebsd-vm@v1.0.8
uses: vmactions/freebsd-vm@v1.1.1
with:
usesh: true
sync: rsync
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ target/
.*.swp
.*.swo
.idea
Cargo.lock
lib*.a
/docs/_build
*.iml
Expand Down
1 change: 1 addition & 0 deletions .vscode/cspell.dictionaries/jargon.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ flamegraph
fsxattr
fullblock
getfacl
getopt
gibi
gibibytes
glob
Expand Down
Loading

0 comments on commit b5eae0f

Please sign in to comment.