Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: trikset/trikRuntime
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.0-rc1
Choose a base ref
...
head repository: trikset/trikRuntime
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 690 changed files with 34,224 additions and 54,253 deletions.
159 changes: 159 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
Language: Cpp
IndentWidth: 8
TabWidth: 8
UseTab: AlignWithSpaces
ColumnLimit: 120
SortIncludes: false
AccessModifierOffset: -8
ReflowComments: false
ConstructorInitializerIndentWidth: 8
ContinuationIndentWidth: 8
AllowShortFunctionsOnASingleLine: None
BreakBeforeBraces: Custom
BraceWrapping:
AfterExternBlock: true
AfterClass: true
AfterFunction: true
AfterNamespace: false
AfterEnum: false
AfterCaseLabel: false
AfterControlStatement: Never
AfterStruct: false
AfterUnion: false
BeforeLambdaBody: false
BeforeElse: false
BeforeCatch: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: false
SplitEmptyNamespace: true
FixNamespaceComments: false
# ??????
IndentPPDirectives: AfterHash
SpaceBeforeParens: Custom
SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterIfMacros: true
AfterOverloadedOperator: false
AfterRequiresInClause: false
AfterRequiresInExpression: false
BeforeNonEmptyParentheses: false
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: false
SpaceAroundPointerQualifiers: Default
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
# ??
#SpacesBeforeTrailingComments: -1
SpacesInAngles: Never
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: -1
IndentCaseBlocks: false
IndentCaseLabels: false
AlignAfterOpenBracket: DontAlign
BreakConstructorInitializers: BeforeComma
AlwaysBreakTemplateDeclarations: true
NamespaceIndentation: None
AlignArrayOfStructures: None
AlignConsecutiveAssignments:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
PadOperators: false
AlignConsecutiveBitFields:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
PadOperators: false
AlignConsecutiveDeclarations:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
PadOperators: false
AlignConsecutiveMacros:
Enabled: false
AcrossEmptyLines: true
AcrossComments: false
AlignCompound: false
PadOperators: false
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AlignTrailingComments: false
# ??
AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortEnumsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
BinPackArguments: true
BinPackParameters: true
BitFieldColonSpacing: After
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeConceptDeclarations: Always
BreakBeforeTernaryOperators: true
BreakInheritanceList: BeforeColon
BreakStringLiterals: true
CompactNamespaces: false
Cpp11BracedListStyle: true
PointerAlignment: Right
QualifierAlignment: Leave
ReferenceAlignment: Pointer
DerivePointerAlignment: false
DisableFormat: false
EmptyLineAfterAccessModifier: Leave
MaxEmptyLinesToKeep: 1
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
ForEachMacros:
- foreach
- Q_FOREACH
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION

IndentAccessModifiers: false
IndentExternBlock: AfterExternBlock
IndentGotoLabels: true
IndentRequiresClause: true
IndentWrappedFunctionNames: false
InsertBraces: false
InsertTrailingCommas: None
KeepEmptyLinesAtTheStartOfBlocks: true
# ???
LambdaBodyIndentation: OuterScope
PackConstructorInitializers: BinPack
RemoveBracesLLVM: false
RequiresClausePosition: OwnLine
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 1
SortUsingDeclarations: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Latest
23 changes: 23 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: 2
updates:
- package-ecosystem: gitsubmodule
directory: "/"
schedule:
interval: monthly
reviewers:
- iakov
assignees:
- iakov

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
reviewers:
- iakov
assignees:
- iakov
groups:
github-actions:
patterns:
- "*" # All submodules updates
19 changes: 19 additions & 0 deletions .github/mergeable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: 2
mergeable:
- when: pull_request.* , pull_request_review.*
validate:
- do: title
must_exclude:
regex: WIP
- do: label
must_exclude:
regex: 'wip'
- do: milestone
no_empty:
enabled: true

- when: issues.opened
validate:
- do: description
no_empty:
enabled: false
175 changes: 175 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
name: GHA CI
on:
push:
branches:
- '**'
pull_request:
branches:
- '**'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
windows:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
trik-version: ['', 'trik_new_age']
include:
- qt-version: '5.15'
mingw-version: '8.1'
mingw-short-version: 81
python-version: '3.12'
defaults:
run:
shell: pwsh #to prevent unexpected Git Bash with wrong MSys DLLs
steps:

- name: Configure git
shell: bash
run: |
git config --global core.symlinks true
git config --global core.autocrlf true
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 1

- name: 'Disable Windows Just-in-Time Debugger/Error reporting'
shell: pwsh
run: |
# reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug" /v Debugger /d - /t REG_SZ /f
# reg add "HKLM\SOFTWARE\Microsoft\.NETFramework" /v DbgManagedDebugger /d - /t REG_SZ /f
# reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /d 1 /t REG_DWORD /f
# reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v ForceQueue /d 1 /t REG_DWORD /f
# reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\Consent" /v DefaultConsent /d 1 /t REG_DWORD /f
# reg add "HKLM\System\CurrentControlSet\Control\Windows" /v ErrorMode /d 2 /t REG_DWORD /f
#
#
# reg add "HKCU\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug" /v Debugger /d - /t REG_SZ /f
# reg add "HKCU\SOFTWARE\Microsoft\.NETFramework" /v DbgManagedDebugger /d - /t REG_SZ /f
# reg add "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /d 1 /t REG_DWORD /f
# reg add "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v ForceQueue /d 1 /t REG_DWORD /f
# reg add "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting\Consent" /v DefaultConsent /d 1 /t REG_DWORD /f
#
- name: Setup MSYS2
uses: msys2/setup-msys2@v2
with:
release: true
update: false
msystem: MINGW32
path-type: inherit #strict #inherit #minimal
install: >-
base
rsync
git
- name: Purge MinGW conflicting packages
run: 'pacman --remove --noconfirm --cascade --recursive --unneeded gcc python3 || :'
shell: msys2 {0}

- name: Install Qt ${{ matrix.qt-version }}
uses: jurplel/install-qt-action@v4
with:
version: ${{matrix.qt-version}}
arch: win32_mingw${{matrix.mingw-short-version}}
modules: 'qtscript'
archives: 'qtbase qtsvg qtserialport qtmultimedia qtwinextras qtimageformats i686 qttools qtdeclarative qtquickcontrols2'
tools: 'tools_mingw,qt.tools.win32_mingw${{matrix.mingw-short-version}}0'
extra: '--external 7z'

# After Qt install action, that spoils pythonLocation variable
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: 'x86'

- name: Update PATH
shell: msys2 {0}
run: |
set -xue
cygpath -w /usr/bin >> $GITHUB_PATH
cygpath -w /mingw32/bin >> $GITHUB_PATH
cygpath -w "${IQTA_TOOLS}/mingw${{matrix.mingw-short-version}}0_32/bin" >> $GITHUB_PATH
cygpath -w "${pythonLocation}/bin" >> $GITHUB_PATH
cygpath -w "${QT_ROOT_DIR}/bin" >> $GITHUB_PATH
- name: Check PATH
shell: msys2 {0}
run: |
echo "Check for DLL-Hell"
where '$PATH:cygwin1.dll' '$PATH:libatomic-1.dll' '$PATH:libgcc_s_dw2-1.dll' '$PATH:libstdc++-6.dll' '$PATH:libwinpthread-1.dll' || :
echo '----'
echo "$GITHUB_PATH"
cat "$GITHUB_PATH"
echo '----'
echo PATH="$PATH"
- name: Check available tools
shell: msys2 {0}
run: |
set -xueo pipefail
uname -a
which rsync && rsync --version
which python3 && python3 --version
which g++ && g++ --version
ls "$IQTA_TOOLS/" "$QT_ROOT_DIR/"
which qmake && qmake --version
- name: QMake
shell: msys2 {0}
run: |
export PYTHON_VERSION=$(python3 --version | grep -o '3\.[^.]\+')
qmake trikRuntime.pro -spec win32-g++ CONFIG+=trik_not_brick CONFIG+=tests CONFIG+=release \
PYTHON_PATH="${pythonLocation}" PYTHON_VERSION=${PYTHON_VERSION} \
CONFIG+=force_debug_info CONFIG+="${{ matrix.trik-version }}"
- name: QMake all
shell: msys2 {0}
timeout-minutes: 5
run: mingw32-make -j $(nproc) qmake_all

- name: Make all
shell: msys2 {0}
timeout-minutes: 10
run: mingw32-make -j $(nproc) all

- name: Tests
id: tests
shell: msys2 {0}
timeout-minutes: 3
continue-on-error: true
run: |
echo "$PATH"
echo ------
export TRIK_PYTHONPATH=$(cygpath -w "$pythonLocation/Lib")
export PYTHONDEVMODE=1
mingw32-make check -k
- name: Prepare for RDP connection
if: false
shell: pwsh
env:
NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
run: |
Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server'-name "fDenyTSConnections" -Value 0
Enable-NetFirewallRule -DisplayGroup "Remote Desktop"
Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp' -name "UserAuthentication" -Value 1
Set-LocalUser -Name "runneradmin" -Password (ConvertTo-SecureString -AsPlainText "P@ssw0rd!" -Force)
Invoke-WebRequest https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-windows-amd64.zip -OutFile ngrok.zip
Expand-Archive ngrok.zip
.\ngrok\ngrok.exe authtoken $Env:NGROK_AUTH_TOKEN
choco install far dependencies
.\ngrok\ngrok.exe tcp 3389
- name: Check errors
if: ${{ steps.tests.outcome == 'failure' }}
run: |
echo Errors occurred in the step Tests
exit 1
Loading