diff --git a/.github/workflows/build-game.yml b/.github/workflows/build-game.yml index 9c25101ed3..52d18ea676 100644 --- a/.github/workflows/build-game.yml +++ b/.github/workflows/build-game.yml @@ -63,7 +63,7 @@ jobs: BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }} if: env.BUTLER_API_KEY != null && github.ref == 'refs/heads/master' run: | - curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-butler.sh" | sudo bash + curl "https://git.anotherfoxguy.com/AnotherFoxGuy/install-scripts/raw/branch/main/install-butler.sh" | sudo bash butler push redist rigs-of-rods/rigs-of-rods-dev:linux-ci --userversion CIBuild-${GITHUB_RUN_NUMBER}-commit-${GITHUB_SHA} shell: bash diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml new file mode 100644 index 0000000000..52cc418a2d --- /dev/null +++ b/.github/workflows/sonarcloud.yml @@ -0,0 +1,56 @@ +name: sonarcloud scan +on: + push: + branches: + - master + - sonarcloud + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + name: sonarcloud scan + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install sonar-scanner and build-wrapper + uses: sonarsource/sonarcloud-github-c-cpp@v2 + id: sonarscan + + - name: Cache conan + uses: actions/cache@v3 + with: + key: conan-ubuntu-${{ hashFiles('conanfile.py') }} + path: ~/.conan2/ + + - name: Install dependencies + run: | + curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash + sudo apt-get update + wget -nv https://cdn.anotherfoxguy.com/sonar-scanner/ror -O run-sonar-scanner + sudo chmod 777 run-sonar-scanner + + - name: Configure + run: | + conan profile detect --force + echo "tools.system.package_manager:mode = install" > ~/.conan2/global.conf + echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf + conan remote add ror-conan https://git.anotherfoxguy.com/api/packages/rorbot/conan -f + conan install . -s build_type=Release -b missing -pr:b=default + cmake --preset conan-release -DCMAKE_INSTALL_PREFIX=redist -DCREATE_CONTENT_FOLDER=ON + shell: bash + + - name: Run build-wrapper + run: build-wrapper-linux-x86-64 --out-dir bw-output make -j4 + + - name: Run sonar-scanner + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_SCANNER_EXE: ${{ steps.sonarscan.outputs.sonar-scanner-binary }} + run: ./run-sonar-scanner + + - name: Clean Conan pkgs + run: conan cache clean "*" -sbd + shell: bash diff --git a/conanfile.py b/conanfile.py index 44d0227bcd..9e384cedbe 100644 --- a/conanfile.py +++ b/conanfile.py @@ -15,7 +15,7 @@ def requirements(self): self.requires("libcurl/7.79.1") self.requires("mygui/3.4.0@anotherfoxguy/stable") self.requires("ogre3d-caelum/0.6.3.1@anotherfoxguy/stable") - self.requires("ogre3d-pagedgeometry/1.2.0@anotherfoxguy/stable") + self.requires("ogre3d-pagedgeometry/1.3.0@anotherfoxguy/stable") self.requires("ogre3d/1.11.6.1@anotherfoxguy/stable", force=True) self.requires("ois/1.4.1@rigsofrods/custom") self.requires("openal-soft/1.22.2") diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..fb9a873c7d --- /dev/null +++ b/renovate.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ], + "packageRules": [ + { + "matchDatasources": ["conan"], + "registryUrls": [ + "https://center.conan.io", + "https://git.anotherfoxguy.com/api/packages/rorbot/conan" + ] + } + ], + "conan": { + "enabled": true + } +} \ No newline at end of file diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000000..6393afa59d --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,16 @@ +sonar.host.url=https://sonarcloud.io +sonar.projectKey=rigs-of-rods +sonar.organization=anotherfoxguy-github + +# This is the name and version displayed in the SonarCloud UI. +sonar.projectName=rigs-of-rods +sonar.projectVersion=2022.04 + +# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. +sonar.sources=source + +# Encoding of the source code. Default is default system encoding +#sonar.sourceEncoding=UTF-8 + +sonar.cfamily.threads=2 +sonar.cfamily.build-wrapper-output=bw-output \ No newline at end of file