Fix broken CI caused by renaming project to Deskflow (#7522)

* Bump CI

* Use 2 core arm runner

* Update ChangeLog

* Fixed filename `deskflowc.exe.manifest`

* Remove  .vscode/settings.json file

* Restore test values to make tests work (test values should not contain app name)

* Fixed syntax error in Windows watchdog

* Add `sonar-project.properties` file

* Change default core count

* Add default package prefix

* Default product name in CMake

* Tweak ChangeLog
This commit is contained in:
Nick Bolton
2024-09-18 15:56:29 +01:00
committed by GitHub
parent 9dc6377bd9
commit 0220a481f2
15 changed files with 86 additions and 101 deletions

View File

@ -39,7 +39,7 @@ jobs:
platform: amd64
- name: debian-12-arm64
runs-on: ubuntu-24.04-8-core-arm64
runs-on: ubuntu-24.04-2-core-arm64
config-dir: debian
base-image: arm64v8/debian:12-slim
platform: arm64
@ -63,7 +63,7 @@ jobs:
platform: amd64
- name: fedora-40-arm64
runs-on: ubuntu-24.04-8-core-arm64
runs-on: ubuntu-24.04-2-core-arm64
config-dir: fedora
base-image: arm64v8/fedora:40
platform: arm64

View File

@ -9,7 +9,7 @@
{
"name": "debian-12-arm64",
"container": "deskflow/deskflow:debian-12-arm64",
"runs-on": "ubuntu-24.04-8-core-arm64",
"runs-on": "ubuntu-24.04-2-core-arm64",
"extra-packages": true
},
{
@ -33,7 +33,7 @@
{
"name": "fedora-40-arm64",
"container": "deskflow/deskflow:fedora-40-arm64",
"runs-on": "ubuntu-24.04-8-core-arm64"
"runs-on": "ubuntu-24.04-2-core-arm64"
},
{
"name": "fedora-40-amd64",

View File

@ -21,9 +21,7 @@ on:
env:
GIT_SHA: ${{ github.sha }}
DESKFLOW_PRODUCT_NAME: ${{ vars.DESKFLOW_PRODUCT_NAME }}
DESKFLOW_PACKAGE_PREFIX: ${{ vars.DESKFLOW_PACKAGE_PREFIX }}
DESKFLOW_LICENSED_PRODUCT: ${{ vars.DESKFLOW_LICENSED_PRODUCT }}
DESKFLOW_ENABLE_ACTIVATION: ${{ vars.DESKFLOW_ENABLE_ACTIVATION }}
DESKFLOW_PACKAGE_PREFIX: ${{ vars.DESKFLOW_PACKAGE_PREFIX || 'deskflow' }}
PACKAGE_BUILD: ${{ !github.event.pull_request.draft }}
PACKAGE_UPLOAD: ${{ !github.event.pull_request.draft && github.ref_name != 'master' }}
UPLOAD_TO_GITHUB: ${{ github.event_name == 'pull_request' && !github.event.pull_request.draft }}

View File

@ -23,7 +23,7 @@ jobs:
SONAR_SCANNER_VERSION: 6.1.0.4477
SONAR_SCANNER_OPTS: -server
SONAR_SCANNER_URL_BASE: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli
CPU_CORE_COUNT: 32
CPU_CORE_COUNT: ${{ vars.SONAR_SCANNER_CPU_COUNT || 4 }}
steps:
- name: Checkout
@ -100,17 +100,7 @@ jobs:
run: |
export PATH=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64/bin:$PATH
sonar-scanner \
-Dsonar.organization=symless \
-Dsonar.projectKey=deskflow_deskflow \
-Dsonar.sources=scripts,src/cmd,src/gui,src/lib \
-Dsonar.tests=src/test \
-Dsonar.exclusions=subprojects/**,build/** \
-Dsonar.coverage.exclusions=subprojects/**,scripts/**,src/test/** \
-Dsonar.cpd.exclusions=**/*Test*.cpp \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }} \
-Dsonar.cfamily.compile-commands=build/compile_commands.json \
-Dsonar.cfamily.threads=${{ env.CPU_CORE_COUNT }} \
-Dsonar.python.version=3.10
-Dsonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}