Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/pav_regression-0.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sanity authored Dec 28, 2024
2 parents 6442c0f + 87945c3 commit d277d98
Show file tree
Hide file tree
Showing 67 changed files with 3,083 additions and 1,700 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
name: Security audit
on:
push:
paths:
- "**/Cargo.toml"
- "**/Cargo.lock"
schedule:
- cron: "0 0 * * *"
workflow_dispatch: false
# push:
# paths:
# - "**/Cargo.toml"
# - "**/Cargo.lock"
# schedule:
# - cron: "0 0 * * *"
jobs:
audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions-rs/audit-check@v1
- uses: rustsec/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
18 changes: 15 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ jobs:
test_all:
name: Test

runs-on: ubuntu-latest
# Use more powerful runner
runs-on: freenet-core-ci

strategy:
max-parallel: 1
Expand All @@ -38,16 +39,20 @@ jobs:
targets: wasm32-unknown-unknown

- uses: Swatinem/rust-cache@v2
if: success() || steps.test.conclusion == 'failure'
with:
save-if: ${{ github.ref == 'refs/heads/main' }}

- name: Install stdlib packages
working-directory: stdlib/typescript
run: npm run dev.package

- name: Build
run: |
cargo install --locked --force --path ./crates/core
cargo install --locked --force --path ./crates/fdev
make -C apps/freenet-ping -f run-ping.mk build
cargo build --locked
cargo install --path ./crates/core
cargo install --path ./crates/fdev
- name: Test - features
run: cargo test --workspace ${{ matrix.args }}
Expand Down Expand Up @@ -75,9 +80,16 @@ jobs:
with:
toolchain: stable
components: clippy
targets: wasm32-unknown-unknown

- uses: Swatinem/rust-cache@v2

- name: Build
run: |
cargo install --locked --force --path ../../crates/fdev
make -f run-ping.mk build
working-directory: apps/freenet-ping

- name: clippy
run: cargo clippy -- -D warnings

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

### Rust ###
# Generated by Cargo
# will have compiled files and executables
Expand All @@ -25,3 +24,4 @@ config.toml
.rustc*

rustc-ice*.txt
.aider*
Loading

0 comments on commit d277d98

Please sign in to comment.