Skip to content

Commit

Permalink
Merge pull request #311 from geonnave/fix-github-action-update-to-v4
Browse files Browse the repository at this point in the history
Fix: update github actions checkout and upload
  • Loading branch information
geonnave authored Oct 11, 2024
2 parents a46841a + 1844cb7 commit d806f7a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Rust formatter
run: rustup component add rustfmt
- name: Check if code is well formatted
Expand All @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run unit tests with default features
run: RUST_BACKTRACE=1 cargo test
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run unit tests with feature matrix # note that we only add `--package lakers-ead-authz` when testing with that config
run: RUST_BACKTRACE=1 cargo test -p lakers -p lakers-crypto -p lakers-shared ${{ matrix.ead == 'ead-authz' && '-p lakers-ead-authz' || '' }} --no-default-features --features="${{ matrix.crypto_backend }}, test-${{ matrix.ead }}" --no-fail-fast -- --test-threads 1
Expand All @@ -65,7 +65,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install arm targets for Rust
run: rustup target add thumbv7m-none-eabi && rustup target add thumbv7em-none-eabihf
Expand All @@ -81,7 +81,7 @@ jobs:

steps:
- name: Checkout lakers
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Generate fstar code over lakers and lakers-shared
run: |
Expand All @@ -98,7 +98,7 @@ jobs:
zip -j -r lakers-fstar.zip $(find . -name *fst)
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: fstar-code
path: ./lakers-fstar.zip
Expand All @@ -114,7 +114,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install arm targets for Rust
run: rustup target add thumbv7em-none-eabihf
Expand All @@ -125,9 +125,9 @@ jobs:
run: cd lakers-c && ./build.sh "${{ matrix.crypto_backend }}"

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: lakers-c
name: lakers-c-${{ matrix.crypto_backend }}
path: ./target/lakers-c-*.zip


Expand All @@ -140,10 +140,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout libcoap
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: obgm/libcoap
path: libcoap
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: set up python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install arm targets for Rust
run: rustup target add thumbv7m-none-eabi
Expand All @@ -230,7 +230,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install arm targets for Rust
run: rustup target add thumbv7em-none-eabihf
Expand All @@ -247,7 +247,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build server
run: cargo build --bin coapserver
Expand All @@ -273,7 +273,7 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download artifacts
uses: actions/[email protected]
with:
Expand All @@ -282,7 +282,7 @@ jobs:
- name: Download artifacts
uses: actions/[email protected]
with:
name: lakers-c
pattern: lakers-c*
path: ./release-artifacts
- name: Release
uses: ncipollo/release-action@v1
Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ default-members = [
resolver = "2"

[workspace.package]
version = "0.7.0"
version = "0.7.1"
repository = "https://github.com/openwsn-berkeley/lakers/"
license = "BSD-3-Clause"
readme = "shared/README.md"
Expand All @@ -40,16 +40,16 @@ categories = [ "no-std::no-alloc", "network-programming", "embedded" ]

[workspace.dependencies]

lakers-shared = { package = "lakers-shared", path = "shared/", version = "^0.7.0" }
lakers-shared = { package = "lakers-shared", path = "shared/", version = "^0.7.1" }

lakers-ead-authz = { package = "lakers-ead-authz", path = "ead/lakers-ead-authz/", version = "^0.7.0" }
lakers-ead-authz = { package = "lakers-ead-authz", path = "ead/lakers-ead-authz/", version = "^0.7.1" }

lakers-crypto = { path = "crypto/" }
lakers-crypto-cryptocell310 = { path = "crypto/lakers-crypto-cryptocell310-sys/" }
lakers-crypto-psa = { path = "crypto/lakers-crypto-psa/" }
lakers-crypto-rustcrypto = { package = "lakers-crypto-rustcrypto", path = "crypto/lakers-crypto-rustcrypto/", version = "^0.7.0" }
lakers-crypto-rustcrypto = { package = "lakers-crypto-rustcrypto", path = "crypto/lakers-crypto-rustcrypto/", version = "^0.7.1" }

lakers = { package = "lakers", path = "lib/", version = "^0.7.0", default-features = false }
lakers = { package = "lakers", path = "lib/", version = "^0.7.1", default-features = false }

[patch.crates-io]
psa-crypto = { git = "https://github.com/malishav/rust-psa-crypto", branch = "baremetal" }

0 comments on commit d806f7a

Please sign in to comment.