Skip to content

Commit ad3fe1f

Browse files
LecrisUTLecrisUT
authored
fix: Various fixes (#12)
- Update `cmake_minimum_required` - Fix windows tests - Fix install for shared library. Static is still weird because it requires installing dependencies - Change `SonarCloud` for `Qodana` - Changed coverage test to use `gcov` - Removed the `set(CMAKE_BUILD_TYPE)`. Instead it should be set via preset or manually, or let the system decide. Can interfere with `cmake --install` and other processes - Simplified packit configuration - Added `renovate` as dependency tracker Closes #11
2 parents a4f73db + f363d58 commit ad3fe1f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+375
-359
lines changed

‎.distro/plans/ctest.fmf

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1-
summary:
2-
Test the bundled ctests
1+
summary: Test the bundled ctests
2+
3+
prepare:
4+
- how: install
5+
package:
6+
- cmake
7+
- gcc-c++
8+
- git
9+
- cmake(Catch2)
10+
- pkgconf
11+
312
discover+:
413
how: fmf
5-
path: test
14+
path: .
15+
test: /test/ctest
616
execute:
717
how: tmt

‎.distro/plans/main.fmf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
adjust+:
2+
# Cannot use initiator: fedora-ci reliably yet
3+
when: initiator is not defined or initiator != packit
4+
discover+:
5+
how: fmf
6+
dist-git-source: true
7+
dist-git-extract: json-type-*/

‎.distro/plans/main.fmf.dist-git

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.distro/plans/rpminspect.fmf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,12 @@ plan:
33
url: https://github.com/packit/tmt-plans
44
ref: main
55
name: /plans/rpminspect
6+
environment:
7+
# upstream is excluded here because it triggers "Unexpected changed source archive content"
8+
# This happens when the released version already contains the package version:
9+
# https://github.com/packit/tmt-plans/issues/13
10+
RPMINSPECT_EXCLUDE: metadata,upstream
11+
adjust:
12+
when: distro >= fedora-41
13+
because: Recently rpminspect fails to get the distro-tag
14+
enabled: false

‎.distro/plans/rpmlint.fmf

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
plan:
2-
import:
3-
url: https://github.com/packit/tmt-plans
4-
ref: main
5-
name: /plans/rpmlint
1+
prepare:
2+
- how: shell
3+
script: cp ./*.rpmlintrc $TMT_PLAN_DATA/
4+
discover:
5+
how: fmf
6+
filter: "tag: rpmlint"
7+
url: https://github.com/packit/tmt-plans
8+
ref: main
9+
execute:
10+
how: tmt

‎test/.fmf/version renamed to ‎.fmf/version

File renamed without changes.

‎.github/renovate.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"packageRules": [
4+
{
5+
"groupName": "CI and devDependencies",
6+
"matchManagers": ["github-actions", "pre-commit", "pep621"]
7+
}
8+
],
9+
"separateMajorMinor": false,
10+
"extends": [
11+
"config:recommended",
12+
":dependencyDashboard",
13+
"schedule:weekly",
14+
":enablePreCommit",
15+
":semanticCommitTypeAll(chore)"
16+
]
17+
}

‎.github/workflows/ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ jobs:
3838
name: 👀 coverage
3939
needs: [ tests ]
4040
uses: ./.github/workflows/step_coverage.yaml
41+
secrets:
42+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4143
if: github.event_name != 'schedule'
4244

4345
static-analysis:
4446
needs: [ pre-commit ]
4547
uses: ./.github/workflows/step_static-analysis.yaml
4648
secrets:
47-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
49+
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
4850
if: github.event_name != 'schedule'
4951

5052
pass:

‎.github/workflows/release.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@ jobs:
1818
with:
1919
mask-experimental: true
2020

21-
# Normally this is unnecessary, but for sonarcloud, this tags the new version
22-
static-analysis:
23-
needs: [ pre-commit ]
24-
uses: ./.github/workflows/step_static-analysis.yaml
25-
secrets:
26-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
27-
2821
docs:
2922
name: 📘 docs
3023
needs: [ pre-commit ]
3124
uses: ./.github/workflows/step_docs.yaml
3225

3326
tests-pass:
3427
name: ✅ Pass
35-
needs: [ pre-commit, tests, static-analysis, docs ]
28+
needs: [ pre-commit, tests, docs ]
3629
runs-on: ubuntu-latest
3730
steps:
3831
- name: Check all CI jobs

‎.github/workflows/step_coverage.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: 👀 coverage
22

33
on:
44
workflow_call:
5+
secrets:
6+
CODECOV_TOKEN:
7+
description: Codecov token of the main repository
8+
required: false
59

610
permissions:
711
contents: read
@@ -16,14 +20,14 @@ jobs:
1620
steps:
1721
- uses: actions/checkout@v4
1822
- uses: lukka/get-cmake@latest
19-
- name: Run CMake configuration for ${{ matrix.toolchain }} toolchain
20-
uses: lukka/run-cmake@v10.3
23+
- uses: lukka/run-cmake@v10.3
2124
with:
2225
workflowPreset: coverage-${{ matrix.coverage }}
23-
- name: Get lcov data
24-
uses: danielealbano/lcov-action@v3
25-
- name: Upload coverage to Codecov
26-
uses: codecov/codecov-action@v3
26+
- uses: threeal/gcovr-action@xml-out
2727
with:
28-
files: coverage.info
28+
xml-out: coverage.xml
29+
- uses: codecov/codecov-action@v4
30+
with:
31+
token: ${{ secrets.CODECOV_TOKEN }}
32+
files: coverage.xml
2933
flags: ${{ matrix.coverage }}-tests

0 commit comments

Comments
 (0)