1
Fork 0
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:
Roy Ivy III 2020-04-15 13:16:09 -05:00 committed by GitHub
commit 129331cbda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 39 deletions

View file

@ -29,34 +29,34 @@ environment:
- CHANNEL: 1.31.0 - CHANNEL: 1.31.0
ARCH: i686 ARCH: i686
ABI: msvc ABI: msvc
# "msvc" ABI # # "msvc" ABI
- CHANNEL: stable # - CHANNEL: stable
ARCH: i686 # ARCH: i686
ABI: msvc # ABI: msvc
- CHANNEL: stable # - CHANNEL: stable
ARCH: x86_64 # ARCH: x86_64
ABI: msvc # ABI: msvc
# - CHANNEL: beta # - CHANNEL: beta
# ARCH: i686 # ARCH: i686
# ABI: msvc # ABI: msvc
# - CHANNEL: beta # - CHANNEL: beta
# ARCH: x86_64 # ARCH: x86_64
# ABI: msvc # ABI: msvc
- CHANNEL: nightly # - CHANNEL: nightly
ARCH: i686 # ARCH: i686
ABI: msvc # ABI: msvc
FEATURES: "windows nightly" # FEATURES: "windows nightly"
- CHANNEL: nightly # - CHANNEL: nightly
ARCH: x86_64 # ARCH: x86_64
ABI: msvc # ABI: msvc
FEATURES: "windows nightly" # FEATURES: "windows nightly"
# "gnu" ABI # "gnu" ABI
- CHANNEL: stable # - CHANNEL: stable
ARCH: i686 # ARCH: i686
ABI: gnu # ABI: gnu
- CHANNEL: stable # - CHANNEL: stable
ARCH: x86_64 # ARCH: x86_64
ABI: gnu # ABI: gnu
# - CHANNEL: beta # - CHANNEL: beta
# ARCH: i686 # ARCH: i686
# ABI: gnu # ABI: gnu
@ -71,11 +71,11 @@ environment:
# ABI: gnu # ABI: gnu
# FEATURES: "windows nightly" # FEATURES: "windows nightly"
# * specific gnu compilers # * specific gnu compilers
- CHANNEL: stable # - CHANNEL: stable
ARCH: i686 # ARCH: i686
ABI: gnu # 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_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 # MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
- CHANNEL: stable - CHANNEL: stable
ARCH: x86_64 ARCH: x86_64
ABI: gnu ABI: gnu

View file

@ -1 +1,7 @@
comment: false comment: false
coverage:
status:
project:
default:
informational: true

View file

@ -104,10 +104,12 @@ jobs:
rustup show active-toolchain rustup show active-toolchain
cargo -V cargo -V
rustc -V rustc -V
cargo-tree tree -V
## dependencies ## dependencies
echo "## dependency list" echo "## dependency list"
cargo +stable fetch --quiet ## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors
cargo +stable tree --all --no-dev-dependencies --no-indent --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique 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 - name: Test
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: 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-gnu , features: feat_os_windows }
- { os: windows-latest , target: i686-pc-windows-msvc , 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: 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-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 } - { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }
steps: steps:
@ -265,10 +267,11 @@ jobs:
rustup show active-toolchain rustup show active-toolchain
cargo -V cargo -V
rustc -V rustc -V
cargo-tree tree -V
## dependencies ## dependencies
echo "## dependency list" echo "## dependency list"
cargo fetch --quiet 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 - name: Build
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:

View file

@ -6,7 +6,7 @@ rust:
os: os:
- linux - linux
- osx # - osx
env: env:
# sphinx v1.8.0 is bugged & fails for linux builds; so, force specfic `sphinx` version # sphinx v1.8.0 is bugged & fails for linux builds; so, force specfic `sphinx` version
@ -20,18 +20,18 @@ matrix:
include: include:
- rust: 1.31.0 - rust: 1.31.0
env: FEATURES=unix env: FEATURES=unix
- rust: stable # - rust: stable
os: linux # os: linux
env: FEATURES=unix TEST_INSTALL=true # env: FEATURES=unix TEST_INSTALL=true
- rust: stable # - rust: stable
os: osx # os: osx
env: FEATURES=macos TEST_INSTALL=true # env: FEATURES=macos TEST_INSTALL=true
- rust: nightly - rust: nightly
os: linux os: linux
env: FEATURES=nightly,unix env: FEATURES=nightly,unix TEST_INSTALL=true
- rust: nightly - rust: nightly
os: osx os: osx
env: FEATURES=nightly,macos env: FEATURES=nightly,macos TEST_INSTALL=true
- rust: nightly - rust: nightly
os: linux 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 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