From 4216d4b0f3c28ea711642ba7653cb7d16baf2649 Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Fri, 26 Mar 2021 16:43:10 -0400 Subject: [PATCH 1/6] version bump for next release --- Cargo.toml | 4 ++-- README.md | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7efa2345..e0723a98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Jason Ozias "] categories = ["development-tools", "development-tools::build-utils"] -description = "Generate build, git, and rustc related 'cargo:rustc-env' instructions via 'build.rs' for use in your code via the env! macro" +description = "Generate 'cargo:rustc-env' instructions via 'build.rs' for use in your code via the env! macro" documentation = "http://docs.rs/vergen" edition = "2018" homepage = "http://github.com/rustyhorde/vergen" @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" name = "vergen" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "5.0.1" +version = "5.1.0" [features] default = ["build", "cargo", "git", "rustc", "si"] diff --git a/README.md b/README.md index 0c1b4097..78dd8f82 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,12 @@ A full list of environment variables that can be generated are listed in the fol | `VERGEN_CARGO_FEATURES` | git,build | | `VERGEN_CARGO_PROFILE` | debug | | `VERGEN_CARGO_TARGET_TRIPLE` | x86_64-unknown-linux-gnu | +| `VERGEN_SYSINFO_NAME` | Darwin | +| `VERGEN_SYSINFO_OS_VERSION` | MacOS 10.15.7 Catalina | +| `VERGEN_SYSINFO_USER` | Yoda | +| `VERGEN_SYSINFO_TOTAL_MEMORY` | 16 GB | +| `VERGEN_SYSINFO_CPU_VENDOR` | Intel(R) Core(TM) i7-7820HQ CPU @ 2.90GHz | +| `VERGEN_SYSINFO_CPU_CORE_COUNT` | 4 | ## Contributing See the documentation at [CONTRIBUTING.md](CONTRIBUTING.md) From c7b30b64f183f2d20b3c5b7201f238046c0ba6c1 Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Fri, 26 Mar 2021 18:49:05 -0400 Subject: [PATCH 2/6] rustfmt & clippy only on stable, tweak test --- .github/workflows/main.yml | 53 +++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb86f497..1e75bc7a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,6 +3,40 @@ on: [push, pull_request] name: CI jobs: + rustfmt: + name: โ˜ข๏ธ Formatting โ˜ข๏ธ + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + components: rustfmt + - run: cargo fmt --all -- --check + clippy: + name: ๐Ÿ•ณ๏ธ Lints ๐Ÿ•ณ๏ธ + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: + - ubuntu-latest + - macos-latest + - windows-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + components: clippy + - run: cargo clippy --all -- -D warnings test: name: vergen runs-on: ${{ matrix.os }} @@ -93,6 +127,13 @@ jobs: ~/.cargo/bin/cargo-tarpaulin* ~/.cargo/bin/cargo-*-all-features* key: ${{ runner.os }}-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }} + - uses: actions-rs/toolchain@v1 + name: ๐Ÿ“… Update ๐Ÿ“… + with: + profile: minimal + toolchain: ${{ matrix.rust }} + target: ${{ matrix.other }} + override: true - name: โœ”๏ธ Checkout (notagsrepo master) โœ”๏ธ run: cd testdata/notagsrepo && git checkout master && cd .. - name: โœ”๏ธ Checkout (tagsrepo master) โœ”๏ธ @@ -116,18 +157,6 @@ jobs: version: latest use-tool-cache: true continue-on-error: true - - name: ๐Ÿ“… Update ๐Ÿ“… - run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }} - - name: โž• Add โž• - run: rustup component add rustfmt || echo "rustfmt not available" - - name: โž• Add โž• - run: rustup component add clippy || echo "clippy not available" - - name: โ˜ข๏ธ Formatting โ˜ข๏ธ - run: cargo fmt --all -- --check - - name: ๐Ÿ•ณ๏ธ Lints ๐Ÿ•ณ๏ธ - run: cargo clippy --all -- -D warnings - - name: ๐Ÿ—๏ธ Build ๐Ÿ—๏ธ - run: cargo build-all-features - name: ๐Ÿงช Test ๐Ÿงช run: cargo test-all-features - name: ๐Ÿ™Š Code Coverage ๐Ÿ™Š From d6d5e480a2afe487121369f5fe2fb2e55bf06207 Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Sat, 27 Mar 2021 11:49:55 -0400 Subject: [PATCH 3/6] action tweaks --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e75bc7a..2b4faeaf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -126,9 +126,12 @@ jobs: path: | ~/.cargo/bin/cargo-tarpaulin* ~/.cargo/bin/cargo-*-all-features* - key: ${{ runner.os }}-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }} + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-${{ matrix.rust }}-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml') }} - uses: actions-rs/toolchain@v1 - name: ๐Ÿ“… Update ๐Ÿ“… + name: ๐Ÿงฐ Toolchain ๐Ÿงฐ with: profile: minimal toolchain: ${{ matrix.rust }} From 8d6705babdb6682f71122fecfeed554725edb5db Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Sat, 27 Mar 2021 11:52:16 -0400 Subject: [PATCH 4/6] action tweaks --- .github/workflows/main.yml | 50 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b4faeaf..c7e19f80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,76 +45,76 @@ jobs: include: - os: ubuntu-latest rust: stable - other: i686-unknown-linux-gnu + target: i686-unknown-linux-gnu - os: ubuntu-latest rust: stable - other: x86_64-unknown-linux-gnu + target: x86_64-unknown-linux-gnu - os: ubuntu-latest rust: beta - other: i686-unknown-linux-gnu + target: i686-unknown-linux-gnu - os: ubuntu-latest rust: beta - other: x86_64-unknown-linux-gnu + target: x86_64-unknown-linux-gnu - os: ubuntu-latest rust: nightly - other: i686-unknown-linux-gnu + target: i686-unknown-linux-gnu - os: ubuntu-latest rust: nightly - other: x86_64-unknown-linux-gnu + target: x86_64-unknown-linux-gnu - os: macos-latest rust: stable - other: x86_64-apple-darwin + target: x86_64-apple-darwin - os: macos-latest rust: stable - other: x86_64-apple-ios + target: x86_64-apple-ios - os: macos-latest rust: beta - other: x86_64-apple-darwin + target: x86_64-apple-darwin - os: macos-latest rust: beta - other: x86_64-apple-ios + target: x86_64-apple-ios - os: macos-latest rust: nightly - other: x86_64-apple-darwin + target: x86_64-apple-darwin - os: macos-latest rust: nightly - other: x86_64-apple-ios + target: x86_64-apple-ios - os: windows-latest rust: stable-msvc - other: i686-pc-windows-msvc + target: i686-pc-windows-msvc - os: windows-latest rust: stable-msvc - other: x86_64-pc-windows-msvc + target: x86_64-pc-windows-msvc - os: windows-latest rust: beta-msvc - other: i686-pc-windows-msvc + target: i686-pc-windows-msvc - os: windows-latest rust: beta-msvc - other: x86_64-pc-windows-msvc + target: x86_64-pc-windows-msvc - os: windows-latest rust: nightly-msvc - other: i686-pc-windows-msvc + target: i686-pc-windows-msvc - os: windows-latest rust: nightly-msvc - other: x86_64-pc-windows-msvc + target: x86_64-pc-windows-msvc - os: windows-latest rust: stable-gnu - other: i686-pc-windows-gnu + target: i686-pc-windows-gnu - os: windows-latest rust: stable-gnu - other: x86_64-pc-windows-gnu + target: x86_64-pc-windows-gnu - os: windows-latest rust: beta-gnu - other: i686-pc-windows-gnu + target: i686-pc-windows-gnu - os: windows-latest rust: beta-gnu - other: x86_64-pc-windows-gnu + target: x86_64-pc-windows-gnu - os: windows-latest rust: nightly-gnu - other: i686-pc-windows-gnu + target: i686-pc-windows-gnu - os: windows-latest rust: nightly-gnu - other: x86_64-pc-windows-gnu + target: x86_64-pc-windows-gnu steps: - name: โœ”๏ธ Checkout โœ”๏ธ uses: actions/checkout@v2 @@ -135,7 +135,7 @@ jobs: with: profile: minimal toolchain: ${{ matrix.rust }} - target: ${{ matrix.other }} + target: ${{ matrix.target }} override: true - name: โœ”๏ธ Checkout (notagsrepo master) โœ”๏ธ run: cd testdata/notagsrepo && git checkout master && cd .. From f57f2148277657b136fcf6ad1626f71a7a5cbcec Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Sat, 27 Mar 2021 12:09:26 -0400 Subject: [PATCH 5/6] More actions tweaks --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c7e19f80..21eaff4a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,8 +17,9 @@ jobs: override: true components: rustfmt - run: cargo fmt --all -- --check - clippy: + lints: name: ๐Ÿ•ณ๏ธ Lints ๐Ÿ•ณ๏ธ + needs: rustfmt runs-on: ${{ matrix.os }} strategy: matrix: @@ -39,6 +40,7 @@ jobs: - run: cargo clippy --all -- -D warnings test: name: vergen + needs: lints runs-on: ${{ matrix.os }} strategy: matrix: From c5fbe3d78e8e3dd07a775b2d0122c9c12d024a61 Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Sat, 27 Mar 2021 12:36:58 -0400 Subject: [PATCH 6/6] cache tweaks --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21eaff4a..aacdb49c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -128,9 +128,6 @@ jobs: path: | ~/.cargo/bin/cargo-tarpaulin* ~/.cargo/bin/cargo-*-all-features* - ~/.cargo/registry - ~/.cargo/git - target key: ${{ runner.os }}-${{ matrix.rust }}-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml') }} - uses: actions-rs/toolchain@v1 name: ๐Ÿงฐ Toolchain ๐Ÿงฐ