Merge branch 'main' into dependabot/cargo/opentelemetry-otlp-0.27.0

freenet · Dec 28, 2024 · 4502464 · 4502464
2 parents 9f13a32 + 87945c3
commit 4502464
Show file tree

Hide file tree

Showing 17 changed files with 675 additions and 302 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -1,11 +1,12 @@
 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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,8 +49,8 @@ jobs:
 
       - name: Build
         run: |
-          cargo install --locked --path ./crates/core
-          cargo install --locked --path ./crates/fdev
+          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 
 
@@ -86,7 +86,7 @@ jobs:
 
       - name: Build
         run: |
-          cargo install --locked --path ../../crates/fdev
+          cargo install --locked --force --path ../../crates/fdev
           make -f run-ping.mk build
         working-directory: apps/freenet-ping
 

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 ### Rust ###
 # Generated by Cargo
 # will have compiled files and executables
@@ -25,3 +24,4 @@ config.toml
 .rustc*
 
 rustc-ice*.txt
+.aider*