explicit linker setting

cpp-linter · Dec 30, 2023 · 6ed51d1 · 6ed51d1
1 parent 19a72db
commit 6ed51d1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/binary-builds.yml b/.github/workflows/binary-builds.yml
@@ -67,11 +67,11 @@ jobs:
         if: runner.os == 'Linux' && startsWith(matrix.target, 'aarch64')
         run: |
           if [[ "${{matrix.target}}" == *musl ]]; then
-            sudo apt-get install musl-dev musl-tools
+            sudo apt-get install musl-dev musl-tools linux-musl-dev
           else
             sudo apt-get install gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
           fi
-      - name: Install musl-gcc (fom compiling OpenSSL)
+      - name: Install musl-gcc (for compiling OpenSSL)
         if: matrix.target == 'x86_64-unknown-linux-musl'
         run: sudo apt-get install musl-tools
 

diff --git a/.github/workflows/run-dev-tests.yml b/.github/workflows/run-dev-tests.yml
@@ -48,6 +48,9 @@ jobs:
         with:
           tool: cargo-nextest,cargo-llvm-cov,cargo-binstall
 
+      - name: Install llvm-cov-pretty (HTL report generator)
+        run: cargo binstall -y llvm-cov-pretty
+
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
@@ -83,36 +86,37 @@ jobs:
           python -m pip install clang-tools
           clang-tools --install ${{ matrix.version }}
 
-      - name: Collect Coverage (for codecov.io)
-        if: matrix.version == '16' && runner.os == 'Linux'
+      - name: Collect Coverage
         working-directory: cpp-linter-lib
         env:
           CLANG_VERSION: ${{ matrix.version }}
-        run: cargo llvm-cov --hide-instantiations --lib --codecov --output-path .coverage.json nextest
-
-      - uses: codecov/codecov-action@v3
-        if: matrix.version == '16' && runner.os == 'Linux'
-        with:
-          token: ${{secrets.CODECOV_TOKEN}}
-          files: cpp-linter-lib/.coverage.json
-          fail_ci_if_error: true # optional (default = false)
-
-      - name: Install llvm-cov-pretty (HTL report generator)
-        if: matrix.version != '16' && runner.os != 'Linux'
-        run: cargo binstall -y llvm-cov-pretty
+        run: cargo llvm-cov --hide-instantiations --lib --no-report nextest
 
-      - name: Collect Coverage (for HTML report)
-        if: matrix.version != '16' && runner.os != 'Linux'
+      - name: Generate Coverage HTML report
         working-directory: cpp-linter-lib
         env:
           CLANG_VERSION: ${{ matrix.version }}
         run: |
-          cargo llvm-cov --hide-instantiations --lib --json --output-path .coverage.json nextest
+          cargo llvm-cov report --json --output-path .coverage.json
           llvm-cov-pretty .coverage.json
 
       - name: Upload coverage data
         uses: actions/upload-artifact@v4
-        if: matrix.version != '16' && runner.os != 'Linux'
         with:
           name: HTML_report-${{ runner.os }}-clang_v${{ matrix.version }}
           path: target/llvm-cov-pretty
+
+      - name: Generate Coverage lcov report
+        if: matrix.version == '16' && runner.os == 'Linux'
+        working-directory: cpp-linter-lib
+        env:
+          CLANG_VERSION: ${{ matrix.version }}
+        run: |
+          cargo llvm-cov report --lcov --output-path lcov.info
+
+      - uses: codecov/codecov-action@v3
+        if: matrix.version == '16' && runner.os == 'Linux'
+        with:
+          token: ${{secrets.CODECOV_TOKEN}}
+          files: cpp-linter-lib/lcov.info
+          fail_ci_if_error: true # optional (default = false)
diff --git a/cpp-linter-lib/Cargo.toml b/cpp-linter-lib/Cargo.toml
@@ -27,3 +27,6 @@ tempfile = "3.8.1"
 
 [features]
 openssl-vendored = ["dep:openssl", "dep:openssl-probe"]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"