From bc08eb0ae390f534629c0118adb783be364d6b64 Mon Sep 17 00:00:00 2001 From: Jacob Peddicord Date: Sat, 20 Nov 2021 16:49:33 -0800 Subject: [PATCH 1/3] Update SPDX dataset --- datasets/modules/spdx-license-list-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datasets/modules/spdx-license-list-data b/datasets/modules/spdx-license-list-data index 47a4ed6..93b6635 160000 --- a/datasets/modules/spdx-license-list-data +++ b/datasets/modules/spdx-license-list-data @@ -1 +1 @@ -Subproject commit 47a4ed6813883e7c7c47fefcc9e31bc55f81fe18 +Subproject commit 93b66352608d470dc094a344a110b94d63fabb73 From 875a2c69b1ca239cce78aac102348b44e6721e91 Mon Sep 17 00:00:00 2001 From: Jacob Peddicord Date: Sat, 20 Nov 2021 17:01:13 -0800 Subject: [PATCH 2/3] 0.4.4 version + changelog --- CHANGELOG.md | 13 +++++++++++++ Cargo.toml | 2 +- cli/Cargo.toml | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 552c8c1..4f0b436 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## [0.4.4] - 2021-11-21 + +### Changed + +- Updated SPDX dataset +- Tons of code cleanup; thanks [@hdhoang] +- `zstd` update to 0.8; thanks [@decathorpe] +- Replace `failure` with `anyhow`; thanks [@hdhoang] + +[0.4.4]: https://github.com/jpeddicord/askalono/releases/tag/0.4.4 +[@hdhoang]: https://github.com/hdhoang +[@decathorpe]: https://github.com/decathorpe + ## [0.4.3] - 2020-09-23 ### Added diff --git a/Cargo.toml b/Cargo.toml index 9d72914..dd3ee9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "askalono" -version = "0.4.3" +version = "0.4.4" edition = "2018" description = "a library to detect the contents of license files" license = "Apache-2.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index eae21be..9637ad6 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "askalono-cli" -version = "0.4.3" +version = "0.4.4" edition = "2018" description = "a tool to detect the contents of license files" license = "Apache-2.0" @@ -18,7 +18,7 @@ include = [ ] [dependencies] -askalono = { version = "0.4.3", path = "../" } +askalono = { version = "0.4.4", path = "../" } clap = "2.32.0" env_logger = "0.7" anyhow = "1.0.44" From aaddad988c58c40042125bd67c4d45e0b84c24c6 Mon Sep 17 00:00:00 2001 From: Jacob Peddicord Date: Sun, 21 Nov 2021 08:58:00 -0800 Subject: [PATCH 3/3] Drop GitHub Actions cache; update locks --- .github/workflows/build.yml | 13 ------------- .github/workflows/release.yml | 13 ------------- cli/Cargo.lock | 4 ++-- extras/lambda/Cargo.lock | 2 +- extras/wasm/Cargo.lock | 2 +- 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d877ca..6809890 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,19 +22,6 @@ jobs: steps: - uses: actions/checkout@v2 - ### Cache - - - name: Cache cargo - uses: actions/cache@v1 - with: - path: ~/.cargo - key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - - name: Cache target - uses: actions/cache@v1 - with: - path: target - key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - ### Submodule hackery - name: Initialize submodules diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4444f1..7ef10c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,19 +25,6 @@ jobs: steps: - uses: actions/checkout@v2 - ### Cache - - - name: Cache cargo - uses: actions/cache@v1 - with: - path: ~/.cargo - key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - - name: Cache target - uses: actions/cache@v1 - with: - path: target - key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - ### Submodule hackery - name: Initialize submodules diff --git a/cli/Cargo.lock b/cli/Cargo.lock index a8b9702..f0ae2d4 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -34,7 +34,7 @@ checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "askalono" -version = "0.4.3" +version = "0.4.4" dependencies = [ "anyhow", "flate2", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "askalono-cli" -version = "0.4.3" +version = "0.4.4" dependencies = [ "anyhow", "askalono", diff --git a/extras/lambda/Cargo.lock b/extras/lambda/Cargo.lock index 78b707e..ad21145 100644 --- a/extras/lambda/Cargo.lock +++ b/extras/lambda/Cargo.lock @@ -25,7 +25,7 @@ checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "askalono" -version = "0.4.3" +version = "0.4.4" dependencies = [ "anyhow", "flate2", diff --git a/extras/wasm/Cargo.lock b/extras/wasm/Cargo.lock index 7597911..b2e7552 100644 --- a/extras/wasm/Cargo.lock +++ b/extras/wasm/Cargo.lock @@ -25,7 +25,7 @@ checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "askalono" -version = "0.4.3" +version = "0.4.4" dependencies = [ "anyhow", "flate2",