Merge commit '54c0a3c874c96f50462ab3f1c9d32c592e8bae50'

external/toxcore/c-toxcore/.github/scripts/cmake-osx

@@ -23,6 +23,7 @@ add_flag -Werror
 # C99-only compilers we test against anyway. Anything that passes all the
 # compilers we use is fine.
 add_c_flag -Wno-c11-extensions
+add_c_flag -Wno-pre-c11-compat
 
 cmake -B_build -H. \
   -DCMAKE_C_FLAGS="$C_FLAGS" \
@@ -39,6 +40,9 @@ cmake -B_build -H. \
 
 cd _build # pushd
 make "-j$NPROC" -k install
-ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 ||
-  ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6
+
+# TODO(iphydf): Investigate if we can get lan discovery to work on macos CI.
+# It works, but CI doesn't let us press the "allow broadcast" button.
+ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 -E lan_discovery ||
+  ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 -E lan_discovery
 cd - # popd

external/toxcore/c-toxcore/.github/scripts/flags-clang.sh

@@ -9,6 +9,11 @@ add_flag -Weverything
 
 # Disable specific warning flags for both C and C++.
 
+# We're not checking nullability, yet.
+# TODO(iphydf): Remove.
+add_flag -Wno-nullable-to-nonnull-conversion
+add_flag -Wno-nullability-completeness
+
 # Very verbose, not very useful. This warns about things like int -> uint
 # conversions that change sign without a cast and narrowing conversions.
 add_flag -Wno-conversion
@@ -30,6 +35,8 @@ add_flag -Wno-missing-braces
 add_flag -Wno-missing-field-initializers
 # We don't use this attribute. It appears in the non-NDEBUG stderr logger.
 add_flag -Wno-missing-noreturn
+# We want to use this extension.
+add_flag -Wno-nullability-extension
 # Useful sometimes, but we accept padding in structs for clarity.
 # Reordering fields to avoid padding will reduce readability.
 add_flag -Wno-padded

external/toxcore/c-toxcore/.github/scripts/sonar-prepare

@@ -17,6 +17,7 @@ add_ld_flag -Wl,-z,defs
 add_flag -Werror
 
 cmake -B_build -H. -GNinja \
+  -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
   -DCMAKE_C_FLAGS="$C_FLAGS" \
   -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
   -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \

external/toxcore/c-toxcore/.github/workflows/ci.yml

@@ -72,7 +72,7 @@ jobs:
   build-windows-msvc:
     strategy:
       matrix:
-        version: [2019, 2022]
+        version: [2022, 2025]
     runs-on: windows-${{ matrix.version }}
     env:
       VCPKG_ROOT: "C:/vcpkg"
@@ -116,12 +116,12 @@ jobs:
               libopus
               libsodium
               libvpx
-              ninja
+              ninja-build
               pkg-config
 
           run: |
             # TODO(iphydf): Investigate NetBSD failures on these tests.
-            sed -Ei -e '/\((TCP|dht_nodes_response_api)\)/s/^/#/' auto_tests/CMakeLists.txt
+            sed -Ei -e '/\((TCP|dht_nodes_response_api|tcp_relay)\)/s/^/#/' auto_tests/CMakeLists.txt
             cmake . \
               -DMIN_LOGGER_LEVEL=TRACE \
               -DMUST_BUILD_TOXAV=ON \

external/toxcore/c-toxcore/.github/workflows/deploy.yml

@@ -345,14 +345,12 @@ jobs:
     uses: TokTok/ci-tools/.github/workflows/deploy-artifact.yml@master
     with:
       project-name: toxcore
-      artifact-source: tox-*.tar.{gz,xz}
-      artifact-versioned: $VERSION.tar.{gz,xz}
+      artifact-source: toxcore.tar.{gz,xz}
+      artifact-versioned: c-toxcore-$VERSION.tar.{gz,xz}
       build: tarball
       run: |
         sudo apt-get install -y --no-install-recommends libsodium-dev
         autoreconf -fi
-        ./configure
-        make dist
-        for f in tox-*.tar.gz; do
-          gunzip -c "$f" | xz -z - >"${f%.gz}.xz"
-        done
+        touch toxcore.tar.gz # prevent error of file changes
+        tar --exclude-vcs --exclude='toxcore.tar.gz' --exclude='third_party/ci-tools' --exclude='*.github' --exclude='autom4te.cache' -zcvf toxcore.tar.gz .
+        gunzip -c toxcore.tar.gz | xz -z - >"toxcore.tar.xz"

external/toxcore/c-toxcore/.github/workflows/sonar-scan.yml

@@ -8,50 +8,34 @@ on:
 
 # Cancel old PR builds when pushing new commits.
 concurrency:
-  group: scan-${{ github.event.pull_request.number || github.ref }}
+  group: sonar-scan-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
   sonar-scan:
     runs-on: ubuntu-latest
     env:
-      SONAR_SCANNER_VERSION: 5.0.1.3006
-      SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
           submodules: recursive
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
-        with:
-          distribution: "zulu"
-          java-version: 17
-      - name: Download and set up sonar-scanner
-        env:
-          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
-        run: |
-          mkdir -p $HOME/.sonar
-          curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
-      - name: Download and set up build-wrapper
-        env:
-          BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
-        run: |
-          curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6
       - name: Install dependencies and prepare build
         run: |
           .github/scripts/sonar-prepare
-      - name: Run build-wrapper
+      - name: Run Build Wrapper
         run: |
           build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} .github/scripts/sonar-build
-      - name: Run sonar-scanner
+      - name: Ensure compile_commands.json is generated
+        run: ls -l "${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
+      - name: SonarQube Scan
         if: github.event_name == 'push'
+        uses: SonarSource/sonarqube-scan-action@v6
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: 'sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"'
+        with:
+          args: >
+            --define "sonar.cfamily.compile-commands=${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"