Skip to content

Commit

Permalink
Upstream merge (#22)
Browse files Browse the repository at this point in the history
* Bump rust to 1.78.0 in actions runner

Also addressed new clippy warnings.

* Bump cargo-deny in Makefile

* Bump rust to stable in actions runner

Also addressed new clippy warnings.

* Update rust dependencies

Also updated `deny.toml`.

* fix: timestamp.json meta can has optional fields

According to the TUF specification, the `meta` attribute of
`timestamp.json` must follow the same specification of `METAFILES`.
That means it has optional `LENGTH` and `HASHES`.

See [this](https://theupdateframework.github.io/specification/latest/#file-formats-timestamp) section of
the TUF specification.

Fixes issue awslabs#771

Signed-off-by: Flavio Castelli <[email protected]>

---------

Signed-off-by: Flavio Castelli <[email protected]>
Co-authored-by: Patrick J.P. Culp <[email protected]>
Co-authored-by: Flavio Castelli <[email protected]>
  • Loading branch information
3 people authored Aug 22, 2024
1 parent 8a4f1d1 commit e588bb1
Show file tree
Hide file tree
Showing 16 changed files with 227 additions and 233 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [develop]

env:
# From-scratch builds with incremental compilation enabled adds unneeded performance and disk overhead.
# From-scratch builds with incremental compilation enabled adds unneeded performance and disk overhead.
CARGO_INCREMENTAL: "0"

jobs:
Expand All @@ -33,7 +33,8 @@ jobs:
key: ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}
- run: rustup default 1.76.0
# print the current rustc. replace stable to pin to a specific toolchain version.
- run: rustup default stable
- run: rustup component add rustfmt
- run: rustup component add clippy
- run: make ${{ matrix.make_target }}
Loading

0 comments on commit e588bb1

Please sign in to comment.