Skip to content

Commit

Permalink
Merge branch 'master' into runAfterUpload
Browse files Browse the repository at this point in the history
  • Loading branch information
iakov authored Dec 7, 2024
2 parents b66e34a + 931d873 commit 0d9f258
Show file tree
Hide file tree
Showing 588 changed files with 4,339 additions and 27,948 deletions.
42 changes: 0 additions & 42 deletions .circleci/config.yml

This file was deleted.

32 changes: 31 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,19 @@ updates:
interval: "monthly"
reviewers:
- "iakov"

groups:
3rd-party:
exclude-patterns:
- "*trikRuntime*"
- "*nxt-tools*"
- "*checkapp*"
- "*gamepad*"
small-apps:
patterns:
- "*nxt-tools*"
- "*checkapp*"
- "*gamepad*"

- package-ecosystem: "gitsubmodule"
directory: "/"
schedule:
Expand All @@ -17,3 +29,21 @@ updates:
- "dependencies"
reviewers:
- "iakov"
groups:
submodules-junior:
patterns:
- "*" # All submodules updates

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "pip"
directory: "/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/"
schedule:
interval: "weekly"
groups:
pip-dependencies:
patterns:
- "*"
10 changes: 5 additions & 5 deletions .github/mergeable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ mergeable:
enabled: true
must_include:
regex: '20[0-9][0-9]\.[0-9]+$'
- do: approvals
min:
count: 1
required:
assignees: true
# - do: approvals
# min:
# count: 1
# required:
# assignees: true
# error:
# - do: checks
# status: 'failure'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codacy-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

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

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: results.sarif
204 changes: 204 additions & 0 deletions .github/workflows/common_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
name: Common CI
on:
push:
branches-ignore:
- 'dependabot**'
tags:
- '*'
paths-ignore:
- '**/lsan.supp'
- 'buildScripts/travis/*'
- 'buildScripts/azure/*'
- 'buildScripts/docker/*'
- 'azure-pipelines.yml'
- '.cirrus.yml'
- '.travis.yml'
- '.mergify.yml'
- 'Brewfile'
- '**/*.html'
- '**/*.txt'
- '**/*.md'
- 'installer/packages/**/meta/prebuild-mac.sh'
- 'installer/packages/**/meta/prebuild-linux-gnu.sh'
- '**/*.dockerfile'
- '**/*.Dockerfile'
- '**/Dockerfile'
- '**/Dockerfile.*'
- 'plugins/robots/checker/scripts/build-checker-installer.sh'
- '.github/workflows/centos.yml'
pull_request:
branches-ignore:
- 'dependabot**'
workflow_dispatch:

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

jobs:
lint:
uses: ./.github/workflows/setup_environment.yml
with:
os: ubuntu-latest
lint: true
build: false
build_installer: false

build-macos-release-tests:
needs: lint
uses: ./.github/workflows/setup_environment.yml
with:
os: macos-13
build: true
build_installer: false
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
trik_python3_version_minor: 11

build-macos-debug-tests:
needs: lint
uses: ./.github/workflows/setup_environment.yml
with:
os: macos-13
build: true
build_installer: false
config: debug
qmake_extra: "CONFIG+=warn_off CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
trik_python3_version_minor: 11

build-macos-installer:
needs: [build-macos-debug-tests, build-macos-release-tests]
uses: ./.github/workflows/setup_environment.yml
with:
os: macos-13
build: true
build_installer: true
qmake_extra: " CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
trik_python3_version_minor: 11
tests: true
secrets: inherit

install-macos-installer:
needs: build-macos-installer
uses: ./.github/workflows/installer.yml
with:
os: macos-13
artifact_name: macos-13-installer

build-ubuntu-release-tests:
needs: lint
uses: ./.github/workflows/setup_environment.yml
with:
os: ubuntu-latest
build: true
build_installer: false
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
trik_python3_version_minor: 10

build-ubuntu-debug-tests:
needs: lint
uses: ./.github/workflows/setup_environment.yml
with:
os: ubuntu-latest
build: true
build_installer: false
config: debug
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
trik_python3_version_minor: 10

build-altlinux-release-tests:
needs: lint
uses: ./.github/workflows/setup_environment.yml
with:
os: ubuntu-latest
container_name: alt:latest
build: true
build_installer: false
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
tests: true

build-rockylinux-distro-release-tests:
needs: lint
uses: ./.github/workflows/setup_environment.yml
with:
os: ubuntu-latest
container_name: rockylinux:8
build: true
build_installer: false
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined"
gcc_version: 13
shell: bash -l {0}
trik_python3_version_minor: 11

# Use Python 3.11, as the Python 3.12 package in Rocky Linux AppStream x86_64 crashes
# with a segmentation fault when restarting the interpreter during the import of asyncio
# (specifically when loading _ssl) in PythonQt::init().
build-rockylinux-installer-release-tests:
needs: lint
uses: ./.github/workflows/setup_environment.yml
with:
os: ubuntu-latest
container_name: rockylinux:8
build: true
build_installer: false
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined CONFIG+=sanitize_address"
gcc_version: 13
trik_qt_version: 5.15
trik_python3_version_minor: 11
linux_installer_environment: true
shell: bash -l {0}

build-rockylinux-installer:
needs: [build-rockylinux-installer-release-tests]
uses: ./.github/workflows/setup_environment.yml
with:
os: ubuntu-latest
container_name: rockylinux:8
build: true
build_installer: true
tests: true
qmake_extra: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
gcc_version: 13
trik_qt_version: 5.15
trik_python3_version_minor: 11
linux_installer_environment: true
shell: bash -l {0}
secrets: inherit

install-ubuntu-installer:
needs: [build-rockylinux-installer]
uses: ./.github/workflows/installer.yml
with:
os: ubuntu-latest
artifact_name: ubuntu-latest-installer

install-ubuntu-installer-1-concurrency:
needs: [build-rockylinux-installer]
uses: ./.github/workflows/installer.yml
with:
os: ubuntu-latest
artifact_name: ubuntu-latest-installer
concurrency: 1

install-rockylinux-installer:
needs: [build-rockylinux-installer]
uses: ./.github/workflows/installer.yml
with:
os: ubuntu-latest
container_name: rockylinux:8
artifact_name: ubuntu-latest-installer

install-altlinux-installer:
needs: [build-rockylinux-installer]
uses: ./.github/workflows/installer.yml
with:
os: ubuntu-latest
container_name: alt:latest
artifact_name: ubuntu-latest-installer

install-archlinux-installer:
needs: [build-rockylinux-installer]
uses: ./.github/workflows/installer.yml
with:
os: ubuntu-latest
container_name: archlinux:latest
artifact_name: ubuntu-latest-installer
Loading

0 comments on commit 0d9f258

Please sign in to comment.