Merge pull request #270 from CoinFabrik/fix-ci

Fix CI
CoinFabrik · Apr 29, 2024 · ab35ef4 · ab35ef4
2 parents 019c3c6 + 1092a87
commit ab35ef4
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/test-detectors.yml b/.github/workflows/test-detectors.yml
@@ -45,7 +45,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+    #          - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
@@ -100,7 +100,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+        #          - macos-latest
         detector: ${{fromJson(needs.prepare-detector-matrix.outputs.matrix)}}
     runs-on: ${{ matrix.os }}
     outputs:
@@ -137,10 +137,10 @@ jobs:
         working-directory: build-status-ubuntu-latest
         run: echo "status=$(cat status-ubuntu-latest.txt)" >> $GITHUB_OUTPUT
 
-      - name: Read macOS build status
-        id: macos_status
-        working-directory: build-status-macos-latest
-        run: echo "status=$(cat status-macos-latest.txt)" >> $GITHUB_OUTPUT
+      #      - name: Read macOS build status
+      #        id: macos_status
+      #        working-directory: build-status-macos-latest
+      #        run: echo "status=$(cat status-macos-latest.txt)" >> $GITHUB_OUTPUT
 
       - name: Find comment
         id: find_comment
@@ -163,7 +163,8 @@ jobs:
             |-------------------------|--------|
             | Detector Validation     | ${{ (needs.validate-detectors.outputs.status == 'success' && '✅ Successful') || '❌ Failed' }} |
             | Build on Ubuntu         | ${{ (steps.ubuntu_status.outputs.status == 'success' && '✅ Successful') || '❌ Failed' }} |
-            | Build on macOS          | ${{ (steps.macos_status.outputs.status == 'success' && '✅ Successful') || '❌ Failed' }} |
             | Tests Execution         | ${{ (needs.test.outputs.status == 'success' && '✅ Successful') || '❌ Failed' }} |
 
             The workflow has completed. Great job! 🚀
+
+#            | Build on macOS          | ${{ (steps.macos_status.outputs.status == 'success' && '✅ Successful') || '❌ Failed' }} |
diff --git a/detectors/unsafe-expect/src/lib.rs b/detectors/unsafe-expect/src/lib.rs
@@ -360,4 +360,4 @@ impl<'tcx> LateLintPass<'tcx> for UnsafeExpect {
 
         walk_expr(&mut visitor, body.value);
     }
-}
+}
diff --git a/detectors/unsafe-unwrap/src/lib.rs b/detectors/unsafe-unwrap/src/lib.rs
@@ -360,4 +360,4 @@ impl<'tcx> LateLintPass<'tcx> for UnsafeUnwrap {
 
         walk_expr(&mut visitor, body.value);
     }
-}
+}
diff --git a/test-cases/lazy-values-not-set/lazy-values-not-set-1/remediated-example/Cargo.toml b/test-cases/lazy-values-not-set/lazy-values-not-set-1/remediated-example/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 authors = ["[your_name] <[your_email]>"]
 
 [lib]
-path = "lib.rs"
+path = "src/lib.rs"
 
 [features]
 default = ["std"]

diff --git a/...alues-not-set-1/remediated-example/lib.rs → ...s-not-set-1/remediated-example/src/lib.rs b/...alues-not-set-1/remediated-example/lib.rs → ...s-not-set-1/remediated-example/src/lib.rs
diff --git a/test-cases/lazy-values-not-set/lazy-values-not-set-1/vulnerable-example/Cargo.toml b/test-cases/lazy-values-not-set/lazy-values-not-set-1/vulnerable-example/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 authors = ["[your_name] <[your_email]>"]
 
 [lib]
-path = "lib.rs"
+path = "src/lib.rs"
 
 [features]
 default = ["std"]
@@ -23,4 +23,4 @@ scale = { workspace = true }
 scale-info = { workspace = true }
 
 [dev-dependencies]
-ink_e2e = { workspace = true }
+ink_e2e = { workspace = true }
diff --git a/...alues-not-set-1/vulnerable-example/lib.rs → ...s-not-set-1/vulnerable-example/src/lib.rs b/...alues-not-set-1/vulnerable-example/lib.rs → ...s-not-set-1/vulnerable-example/src/lib.rs
diff --git a/test-cases/reentrancy-1/reentrancy-1-2/remediated-example/src/lib.rs b/test-cases/reentrancy-1/reentrancy-1-2/remediated-example/src/lib.rs
@@ -5,6 +5,7 @@ pub use self::vault::{Vault, VaultRef};
 #[ink::contract]
 mod vault {
     use core::result::Result;
+
     use ink::{
         env::call::{build_call, Selector},
         storage::Mapping,

diff --git a/test-cases/reentrancy-1/reentrancy-1-2/vulnerable-example/src/lib.rs b/test-cases/reentrancy-1/reentrancy-1-2/vulnerable-example/src/lib.rs
@@ -5,6 +5,7 @@ pub use self::vault::{Vault, VaultRef};
 #[ink::contract]
 mod vault {
     use core::result::Result;
+
     use ink::{
         env::call::{build_call, Selector},
         storage::Mapping,