mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-27 19:17:43 +00:00
Merge pull request #1480 from rivy/fix.cargo-tree-bug
Fix `cargo tree` bug + CICD issues
This commit is contained in:
commit
129331cbda
4 changed files with 48 additions and 39 deletions
|
@ -29,34 +29,34 @@ environment:
|
|||
- CHANNEL: 1.31.0
|
||||
ARCH: i686
|
||||
ABI: msvc
|
||||
# "msvc" ABI
|
||||
- CHANNEL: stable
|
||||
ARCH: i686
|
||||
ABI: msvc
|
||||
- CHANNEL: stable
|
||||
ARCH: x86_64
|
||||
ABI: msvc
|
||||
# # "msvc" ABI
|
||||
# - CHANNEL: stable
|
||||
# ARCH: i686
|
||||
# ABI: msvc
|
||||
# - CHANNEL: stable
|
||||
# ARCH: x86_64
|
||||
# ABI: msvc
|
||||
# - CHANNEL: beta
|
||||
# ARCH: i686
|
||||
# ABI: msvc
|
||||
# - CHANNEL: beta
|
||||
# ARCH: x86_64
|
||||
# ABI: msvc
|
||||
- CHANNEL: nightly
|
||||
ARCH: i686
|
||||
ABI: msvc
|
||||
FEATURES: "windows nightly"
|
||||
- CHANNEL: nightly
|
||||
ARCH: x86_64
|
||||
ABI: msvc
|
||||
FEATURES: "windows nightly"
|
||||
# - CHANNEL: nightly
|
||||
# ARCH: i686
|
||||
# ABI: msvc
|
||||
# FEATURES: "windows nightly"
|
||||
# - CHANNEL: nightly
|
||||
# ARCH: x86_64
|
||||
# ABI: msvc
|
||||
# FEATURES: "windows nightly"
|
||||
# "gnu" ABI
|
||||
- CHANNEL: stable
|
||||
ARCH: i686
|
||||
ABI: gnu
|
||||
- CHANNEL: stable
|
||||
ARCH: x86_64
|
||||
ABI: gnu
|
||||
# - CHANNEL: stable
|
||||
# ARCH: i686
|
||||
# ABI: gnu
|
||||
# - CHANNEL: stable
|
||||
# ARCH: x86_64
|
||||
# ABI: gnu
|
||||
# - CHANNEL: beta
|
||||
# ARCH: i686
|
||||
# ABI: gnu
|
||||
|
@ -71,11 +71,11 @@ environment:
|
|||
# ABI: gnu
|
||||
# FEATURES: "windows nightly"
|
||||
# * specific gnu compilers
|
||||
- CHANNEL: stable
|
||||
ARCH: i686
|
||||
ABI: gnu
|
||||
MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z/download
|
||||
MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
|
||||
# - CHANNEL: stable
|
||||
# ARCH: i686
|
||||
# ABI: gnu
|
||||
# MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z/download
|
||||
# MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
|
||||
- CHANNEL: stable
|
||||
ARCH: x86_64
|
||||
ABI: gnu
|
||||
|
|
|
@ -1 +1,7 @@
|
|||
comment: false
|
||||
|
||||
coverage:
|
||||
status:
|
||||
project:
|
||||
default:
|
||||
informational: true
|
||||
|
|
11
.github/workflows/CICD.yml
vendored
11
.github/workflows/CICD.yml
vendored
|
@ -104,10 +104,12 @@ jobs:
|
|||
rustup show active-toolchain
|
||||
cargo -V
|
||||
rustc -V
|
||||
cargo-tree tree -V
|
||||
## dependencies
|
||||
echo "## dependency list"
|
||||
cargo +stable fetch --quiet
|
||||
cargo +stable tree --all --no-dev-dependencies --no-indent --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
|
||||
## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors
|
||||
RUSTUP_TOOLCHAIN=stable cargo fetch --quiet
|
||||
RUSTUP_TOOLCHAIN=stable cargo-tree tree --all --no-dev-dependencies --no-indent --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
|
||||
- name: Test
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
|
@ -132,7 +134,7 @@ jobs:
|
|||
- { os: windows-latest , target: i686-pc-windows-gnu , features: feat_os_windows }
|
||||
- { 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 , toolchain: nightly-x86_64-pc-windows-gnu } ## !maint: [rivy; due 2020-21-03] disable/remove when rust beta >= v1.43.0 is available (~mid-March)
|
||||
# - { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows , toolchain: beta-x86_64-pc-windows-gnu } ## maint: [rivy; due 2020-21-03; due 2020-01-05] enable when rust beta >= v1.43.0 is available (~mid-March); disable when rust stable >= 1.43.0 is available (~early-May)
|
||||
- { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows , toolchain: beta-x86_64-pc-windows-gnu } ## maint: [rivy; due 2020-21-03; due 2020-01-05] enable when rust beta >= v1.43.0 is available (~mid-March); disable when rust stable >= 1.43.0 is available (~early-May)
|
||||
# - { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows } ## note: requires rust >= 1.43.0 to link correctly # ! maint: [rivy; due 2020-01-05] enable when rust stable >= 1.43.0 is available
|
||||
- { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }
|
||||
steps:
|
||||
|
@ -265,10 +267,11 @@ jobs:
|
|||
rustup show active-toolchain
|
||||
cargo -V
|
||||
rustc -V
|
||||
cargo-tree tree -V
|
||||
## dependencies
|
||||
echo "## dependency list"
|
||||
cargo fetch --quiet
|
||||
cargo tree --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --all --no-dev-dependencies --no-indent | grep -vE "$PWD" | sort --unique
|
||||
cargo-tree tree --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --all --no-dev-dependencies --no-indent | grep -vE "$PWD" | sort --unique
|
||||
- name: Build
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
|
|
18
.travis.yml
18
.travis.yml
|
@ -6,7 +6,7 @@ rust:
|
|||
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
# - osx
|
||||
|
||||
env:
|
||||
# sphinx v1.8.0 is bugged & fails for linux builds; so, force specfic `sphinx` version
|
||||
|
@ -20,18 +20,18 @@ matrix:
|
|||
include:
|
||||
- rust: 1.31.0
|
||||
env: FEATURES=unix
|
||||
- rust: stable
|
||||
os: linux
|
||||
env: FEATURES=unix TEST_INSTALL=true
|
||||
- rust: stable
|
||||
os: osx
|
||||
env: FEATURES=macos TEST_INSTALL=true
|
||||
# - rust: stable
|
||||
# os: linux
|
||||
# env: FEATURES=unix TEST_INSTALL=true
|
||||
# - rust: stable
|
||||
# os: osx
|
||||
# env: FEATURES=macos TEST_INSTALL=true
|
||||
- rust: nightly
|
||||
os: linux
|
||||
env: FEATURES=nightly,unix
|
||||
env: FEATURES=nightly,unix TEST_INSTALL=true
|
||||
- rust: nightly
|
||||
os: osx
|
||||
env: FEATURES=nightly,macos
|
||||
env: FEATURES=nightly,macos TEST_INSTALL=true
|
||||
- rust: nightly
|
||||
os: linux
|
||||
env: FEATURES=nightly,feat_os_unix_redox CC=x86_64-unknown-redox-gcc CARGO_ARGS='--no-default-features --target=x86_64-unknown-redox' REDOX=1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue