Skip to content

Commit d390947

Browse files
committed
1 parent d1e850c commit d390947

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
lines changed

.github/settings.yml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,52 @@ branches:
1212
protection:
1313
required_status_checks:
1414
contexts:
15-
- "bazel-asan"
1615
- "bazel-dbg"
1716
- "bazel-opt"
18-
- "bazel-tsan"
17+
- "build-alpine-s390x"
18+
- "build-android"
1919
- "build-compcert"
2020
- "build-macos"
2121
- "build-nacl"
2222
- "build-tcc"
2323
- "build-win32"
2424
- "build-win64"
25-
- "CodeFactor"
26-
- "common / buildifier"
27-
- "coverage-linux"
2825
- "ci/circleci: asan"
26+
- "ci/circleci: bazel-asan"
27+
- "ci/circleci: bazel-msan"
28+
- "ci/circleci: bazel-tsan"
2929
- "ci/circleci: clang-analyze"
3030
- "ci/circleci: clang-tidy"
3131
- "ci/circleci: cpplint"
3232
- "ci/circleci: infer"
33-
- "ci/circleci: msan"
3433
- "ci/circleci: static-analysis"
3534
- "ci/circleci: tsan"
3635
- "ci/circleci: ubsan"
3736
- "cimple"
37+
- "cimplefmt"
38+
- "CodeFactor"
3839
- "code-review/reviewable"
39-
- "continuous-integration/appveyor/pr"
40+
- "common / buildifier"
41+
- "coverage-linux"
4042
- "docker-bootstrap-node"
4143
- "docker-bootstrap-node-websocket"
44+
- "docker-clusterfuzz"
45+
- "docker-esp32"
46+
- "docker-fuzzer"
4247
- "docker-toxcore-js"
48+
- "docker-win32"
49+
- "docker-win64"
50+
- "doxygen"
51+
- "freebsd"
52+
- "Hound"
53+
- "misra"
4354
- "mypy"
55+
- "program-analysis"
4456
- "sonar-scan"
57+
- "tokstyle"
58+
- "TokTok.c-toxcore"
59+
- "TokTok.c-toxcore (windows_msvc_conan shared)"
60+
- "TokTok.c-toxcore (windows_msvc_conan static)"
4561

4662
# Labels specific to c-toxcore.
4763
labels:

.github/workflows/sonar-scan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
sonar-scan:
1616
runs-on: ubuntu-latest
1717
env:
18-
SONAR_SCANNER_VERSION: 4.4.0.2170
18+
SONAR_SCANNER_VERSION: 5.0.1.3006
1919
SONAR_SERVER_URL: "https://sonarcloud.io"
2020
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
2121
steps:
2222
- uses: actions/checkout@v2
2323
with:
2424
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2525
submodules: recursive
26-
- name: Set up JDK 11
26+
- name: Set up JDK 17
2727
uses: actions/setup-java@v1
2828
with:
29-
java-version: 11
29+
java-version: 17
3030
- name: Download and set up sonar-scanner
3131
env:
3232
SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip

0 commit comments

Comments
 (0)