Skip to content

Commit 0d9f258

Browse files
iakoviakov
authored
Merge branch 'master' into runAfterUpload
2 parents b66e34a + 931d873 commit 0d9f258

588 files changed

Lines changed: 4339 additions & 27948 deletions

File tree

Some content is hidden

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

‎.circleci/config.yml‎

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

‎.github/dependabot.yml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@ updates:
66
interval: "monthly"
77
reviewers:
88
- "iakov"
9-
9+
groups:
10+
3rd-party:
11+
exclude-patterns:
12+
- "*trikRuntime*"
13+
- "*nxt-tools*"
14+
- "*checkapp*"
15+
- "*gamepad*"
16+
small-apps:
17+
patterns:
18+
- "*nxt-tools*"
19+
- "*checkapp*"
20+
- "*gamepad*"
21+
1022
- package-ecosystem: "gitsubmodule"
1123
directory: "/"
1224
schedule:
@@ -17,3 +29,21 @@ updates:
1729
- "dependencies"
1830
reviewers:
1931
- "iakov"
32+
groups:
33+
submodules-junior:
34+
patterns:
35+
- "*" # All submodules updates
36+
37+
- package-ecosystem: "github-actions"
38+
directory: "/"
39+
schedule:
40+
interval: "weekly"
41+
42+
- package-ecosystem: "pip"
43+
directory: "/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/"
44+
schedule:
45+
interval: "weekly"
46+
groups:
47+
pip-dependencies:
48+
patterns:
49+
- "*"

‎.github/mergeable.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ mergeable:
1313
enabled: true
1414
must_include:
1515
regex: '20[0-9][0-9]\.[0-9]+$'
16-
- do: approvals
17-
min:
18-
count: 1
19-
required:
20-
assignees: true
16+
# - do: approvals
17+
# min:
18+
# count: 1
19+
# required:
20+
# assignees: true
2121
# error:
2222
# - do: checks
2323
# status: 'failure'

‎.github/workflows/codacy-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
steps:
2222
# Checkout the repository to the GitHub Actions runner
2323
- name: Checkout code
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525
with:
2626
submodules: true
2727

2828
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
2929
- name: Run Codacy Analysis CLI
30-
uses: codacy/codacy-analysis-cli-action@1.1.0
30+
uses: codacy/codacy-analysis-cli-action@v4.4.5
3131
with:
3232
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
3333
# You can also omit the token and run the tools that support default configurations
@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the SARIF file generated in the previous step
4545
- name: Upload SARIF results file
46-
uses: github/codeql-action/upload-sarif@v1
46+
uses: github/codeql-action/upload-sarif@v3
4747
with:
4848
sarif_file: results.sarif

‎.github/workflows/common_build.yml‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
name: Common CI
2+
on:
3+
push:
4+
branches-ignore:
5+
- 'dependabot**'
6+
tags:
7+
- '*'
8+
paths-ignore:
9+
- '**/lsan.supp'
10+
- 'buildScripts/travis/*'
11+
- 'buildScripts/azure/*'
12+
- 'buildScripts/docker/*'
13+
- 'azure-pipelines.yml'
14+
- '.cirrus.yml'
15+
- '.travis.yml'
16+
- '.mergify.yml'
17+
- 'Brewfile'
18+
- '**/*.html'
19+
- '**/*.txt'
20+
- '**/*.md'
21+
- 'installer/packages/**/meta/prebuild-mac.sh'
22+
- 'installer/packages/**/meta/prebuild-linux-gnu.sh'
23+
- '**/*.dockerfile'
24+
- '**/*.Dockerfile'
25+
- '**/Dockerfile'
26+
- '**/Dockerfile.*'
27+
- 'plugins/robots/checker/scripts/build-checker-installer.sh'
28+
- '.github/workflows/centos.yml'
29+
pull_request:
30+
branches-ignore:
31+
- 'dependabot**'
32+
workflow_dispatch:
33+
34+
concurrency:
35+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
36+
cancel-in-progress: true
37+
38+
jobs:
39+
lint:
40+
uses: ./.github/workflows/setup_environment.yml
41+
with:
42+
os: ubuntu-latest
43+
lint: true
44+
build: false
45+
build_installer: false
46+
47+
build-macos-release-tests:
48+
needs: lint
49+
uses: ./.github/workflows/setup_environment.yml
50+
with:
51+
os: macos-13
52+
build: true
53+
build_installer: false
54+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
55+
trik_python3_version_minor: 11
56+
57+
build-macos-debug-tests:
58+
needs: lint
59+
uses: ./.github/workflows/setup_environment.yml
60+
with:
61+
os: macos-13
62+
build: true
63+
build_installer: false
64+
config: debug
65+
qmake_extra: "CONFIG+=warn_off CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
66+
trik_python3_version_minor: 11
67+
68+
build-macos-installer:
69+
needs: [build-macos-debug-tests, build-macos-release-tests]
70+
uses: ./.github/workflows/setup_environment.yml
71+
with:
72+
os: macos-13
73+
build: true
74+
build_installer: true
75+
qmake_extra: " CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
76+
trik_python3_version_minor: 11
77+
tests: true
78+
secrets: inherit
79+
80+
install-macos-installer:
81+
needs: build-macos-installer
82+
uses: ./.github/workflows/installer.yml
83+
with:
84+
os: macos-13
85+
artifact_name: macos-13-installer
86+
87+
build-ubuntu-release-tests:
88+
needs: lint
89+
uses: ./.github/workflows/setup_environment.yml
90+
with:
91+
os: ubuntu-latest
92+
build: true
93+
build_installer: false
94+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
95+
trik_python3_version_minor: 10
96+
97+
build-ubuntu-debug-tests:
98+
needs: lint
99+
uses: ./.github/workflows/setup_environment.yml
100+
with:
101+
os: ubuntu-latest
102+
build: true
103+
build_installer: false
104+
config: debug
105+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
106+
trik_python3_version_minor: 10
107+
108+
build-altlinux-release-tests:
109+
needs: lint
110+
uses: ./.github/workflows/setup_environment.yml
111+
with:
112+
os: ubuntu-latest
113+
container_name: alt:latest
114+
build: true
115+
build_installer: false
116+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
117+
tests: true
118+
119+
build-rockylinux-distro-release-tests:
120+
needs: lint
121+
uses: ./.github/workflows/setup_environment.yml
122+
with:
123+
os: ubuntu-latest
124+
container_name: rockylinux:8
125+
build: true
126+
build_installer: false
127+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined"
128+
gcc_version: 13
129+
shell: bash -l {0}
130+
trik_python3_version_minor: 11
131+
132+
# Use Python 3.11, as the Python 3.12 package in Rocky Linux AppStream x86_64 crashes
133+
# with a segmentation fault when restarting the interpreter during the import of asyncio
134+
# (specifically when loading _ssl) in PythonQt::init().
135+
build-rockylinux-installer-release-tests:
136+
needs: lint
137+
uses: ./.github/workflows/setup_environment.yml
138+
with:
139+
os: ubuntu-latest
140+
container_name: rockylinux:8
141+
build: true
142+
build_installer: false
143+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined CONFIG+=sanitize_address"
144+
gcc_version: 13
145+
trik_qt_version: 5.15
146+
trik_python3_version_minor: 11
147+
linux_installer_environment: true
148+
shell: bash -l {0}
149+
150+
build-rockylinux-installer:
151+
needs: [build-rockylinux-installer-release-tests]
152+
uses: ./.github/workflows/setup_environment.yml
153+
with:
154+
os: ubuntu-latest
155+
container_name: rockylinux:8
156+
build: true
157+
build_installer: true
158+
tests: true
159+
qmake_extra: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
160+
gcc_version: 13
161+
trik_qt_version: 5.15
162+
trik_python3_version_minor: 11
163+
linux_installer_environment: true
164+
shell: bash -l {0}
165+
secrets: inherit
166+
167+
install-ubuntu-installer:
168+
needs: [build-rockylinux-installer]
169+
uses: ./.github/workflows/installer.yml
170+
with:
171+
os: ubuntu-latest
172+
artifact_name: ubuntu-latest-installer
173+
174+
install-ubuntu-installer-1-concurrency:
175+
needs: [build-rockylinux-installer]
176+
uses: ./.github/workflows/installer.yml
177+
with:
178+
os: ubuntu-latest
179+
artifact_name: ubuntu-latest-installer
180+
concurrency: 1
181+
182+
install-rockylinux-installer:
183+
needs: [build-rockylinux-installer]
184+
uses: ./.github/workflows/installer.yml
185+
with:
186+
os: ubuntu-latest
187+
container_name: rockylinux:8
188+
artifact_name: ubuntu-latest-installer
189+
190+
install-altlinux-installer:
191+
needs: [build-rockylinux-installer]
192+
uses: ./.github/workflows/installer.yml
193+
with:
194+
os: ubuntu-latest
195+
container_name: alt:latest
196+
artifact_name: ubuntu-latest-installer
197+
198+
install-archlinux-installer:
199+
needs: [build-rockylinux-installer]
200+
uses: ./.github/workflows/installer.yml
201+
with:
202+
os: ubuntu-latest
203+
container_name: archlinux:latest
204+
artifact_name: ubuntu-latest-installer

0 commit comments

Comments
 (0)