Fix some things in workflows

Guilospanck · May 29, 2023 · fce9443 · fce9443
1 parent c470984
commit fce9443
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/check-and-lint.yml b/.github/workflows/check-and-lint.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   check:
     name: Check
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -38,7 +38,7 @@ jobs:
 
   clippy:
     name: Clippy
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   deploy:
     name: Deploy packages
-    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   tests:
     name: Run Tests
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     env:
       PROJECT_NAME_UNDERSCORE: nostr
       CARGO_INCREMENTAL: 0
@@ -20,10 +20,13 @@ jobs:
       matrix:
         rust:
           - nightly
-        directories:
-          - ./relay
-          - ./client
-          - ./nostr-sdk
+        package:
+          - directory: ./relay
+            name: relay
+          - directory: ./client
+            name: client
+          - directory: ./nostr-sdk
+            name: nostr-sdk
 
     steps:
     # Checkout repository
@@ -40,7 +43,7 @@ jobs:
 
     # Build 
     - name: Build
-      working-directory: ${{ matrix.directories }}
+      working-directory: ${{ matrix.package.directory }}
       run: cargo build $CARGO_OPTIONS
 
     # Cache
@@ -53,30 +56,30 @@ jobs:
           ~/.cargo/registry/cache/
           ~/.cargo/git/db/
           target/
-        key: test-${{ runner.os }}-cargo-${{ matrix.rust }}-project-${{ matrix.directories }}-${{ hashFiles('**/Cargo.lock') }}
+        key: test-${{ runner.os }}-cargo-${{ matrix.rust }}-project-${{ matrix.package.directory }}-${{ hashFiles('**/Cargo.lock') }}
 
     # Tests
     - name: Run tests
-      working-directory: ${{ matrix.directories }}
+      working-directory: ${{ matrix.package.directory }}
       run: |
         cargo test --tests
         cargo test --doc
 
     # Coverage
     ##! CARGO_INCREMENTAL, RUSTFLAGS, RUSTDOCFLAGS - added to CARGO_OPTIONS in cargo test needed for code coverage
     - name: Generate test result and coverage report
-      working-directory: ${{ matrix.directories }}
+      working-directory: ${{ matrix.package.directory }}
       run: |
         find . -name '*.gcda' -delete
         cargo install grcov --force;
         cargo test $CARGO_OPTIONS --tests;
         zip -0 ccov.zip `find . \( -name "$PROJECT_NAME_UNDERSCORE*.gc*" \) -print`;
-        grcov ccov.zip -s . -t lcov --llvm --ignore-not-existing --ignore "/*" -o lcov.info;
+        grcov ccov.zip -s . -t lcov --llvm --ignore-not-existing --ignore "/*" -o ${{ matrix.package.name }}.info;
+        cat ${{ matrix.package.name }}.info >> final_coverage.info
 
     # Upload to CodeCov
     - name: Upload to CodeCov
       uses: codecov/codecov-action@v3
       with:
-        working-directory: ${{ matrix.directories }}
-        files: ./lcov.info
+        files: ./final_coverage.info
         fail_ci_if_error: true
diff --git a/relay/Makefile b/relay/Makefile
@@ -1,5 +1,5 @@
 compile-to-x86_64-unknown-linux-gnu:
-	cross build --release --target x86_64-unknown-linux-gnu -v
+	cross build --release --target x86_64-unknown-linux-gnu
 
 build-release-mode:
 	cargo build --release