Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency ogre3d-pagedgeometry to v1.3.0 #26

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-game.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
56 changes: 56 additions & 0 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
18 changes: 18 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -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
}
}
16 changes: 16 additions & 0 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -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
Loading