From 5e023a149f66a993b825e7f51901d55372195bd0 Mon Sep 17 00:00:00 2001 From: Philip Top Date: Fri, 29 Dec 2023 06:23:15 -0800 Subject: [PATCH 1/4] Create codeql.yml only check C++ code --- .github/workflows/codeql.yml | 81 ++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000000..b483ee2efc --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,81 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "main", "develop" ] + pull_request: + branches: [ "main", "develop" ] + schedule: + - cron: '23 6 * * 0' + +jobs: + analyze: + name: Analyze + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners + # Consider using larger runners for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'c-cpp'] + # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] + # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From 71f331d14794e176838bb19a75af3904e0995450 Mon Sep 17 00:00:00 2001 From: Philip Top Date: Mon, 1 Jan 2024 07:38:21 -0800 Subject: [PATCH 2/4] update workflows --- .github/workflows/code-coverage.yml | 4 ++-- .github/workflows/codeql.yml | 30 +++++++++++++++++++---------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index cb36d3e5a5..0d794e74e1 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -24,13 +24,13 @@ jobs: DISABLE_CXX_SHARED: 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true if: github.event_name != 'schedule' - name: Checkout develop branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true ref: develop diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b483ee2efc..d117884098 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -12,6 +12,7 @@ name: "CodeQL" on: + workflow_dispatch: push: branches: [ "main", "develop" ] pull_request: @@ -27,8 +28,18 @@ jobs: # - https://gh.io/supported-runners-and-hardware-resources # - https://gh.io/using-larger-runners # Consider using larger runners for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + runs-on: ubuntu-latest + container: helics/buildenv:ubuntu22.04-default-builder + timeout-minutes: 60 + defaults: + run: + shell: bash + env: + CMAKE_GENERATOR: Unix Makefiles + MAKEFLAGS: '-j 4' + DISABLE_INTERFACES: 'Java' + DISABLE_EXAMPLES: 'true' + DISABLE_CXX_SHARED: 'true' permissions: actions: read contents: read @@ -60,20 +71,19 @@ jobs: # queries: security-extended,security-and-quality - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 - # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun # If the Autobuild fails above, remove it and uncomment the following three lines. # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh + - run: | + echo "Run, Build Application using script" + unset VCPKG_ROOT + git config --global --add safe.directory ${GITHUB_WORKSPACE} + source scripts/setup-helics-ci-options.sh + mkdir -p build && cd build + ../scripts/ci-build.sh - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 From bfea2a5de63b68cee807c66a9b399853d5937f35 Mon Sep 17 00:00:00 2001 From: Philip Top Date: Mon, 1 Jan 2024 08:25:16 -0800 Subject: [PATCH 3/4] fix code-ql warnings --- .github/workflows/codeql.yml | 5 ++++- src/helics/application_api/Subscriptions.hpp | 5 +++-- src/helics/application_api/ValueConverter.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d117884098..2c72e6622d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -58,6 +58,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + # tell git that the workspace directory is safe + - run: | + git config --global --add safe.directory ${GITHUB_WORKSPACE} + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 @@ -80,7 +84,6 @@ jobs: - run: | echo "Run, Build Application using script" unset VCPKG_ROOT - git config --global --add safe.directory ${GITHUB_WORKSPACE} source scripts/setup-helics-ci-options.sh mkdir -p build && cd build ../scripts/ci-build.sh diff --git a/src/helics/application_api/Subscriptions.hpp b/src/helics/application_api/Subscriptions.hpp index c41082503b..21e4f51f59 100644 --- a/src/helics/application_api/Subscriptions.hpp +++ b/src/helics/application_api/Subscriptions.hpp @@ -214,8 +214,9 @@ class VectorSubscription2d { static_assert( std::is_base_of>::value, "Second argument must be a pointer to a ValueFederate"); - ids.reserve(count_x * count_y); - vals.resize(count_x * count_y, defValue); + std::size_t arrayCount=static_cast(count_x) * static_cast(count_y); + ids.reserve(arrayCount); + vals.resize(arrayCount, defValue); for (auto ind_x = startIndex_x; ind_x < startIndex_x + count_x; ++ind_x) { for (auto ind_y = startIndex_y; ind_y < startIndex_y + count_y; ++ind_y) { diff --git a/src/helics/application_api/ValueConverter.cpp b/src/helics/application_api/ValueConverter.cpp index 42818f7ef1..3ee0be300b 100644 --- a/src/helics/application_api/ValueConverter.cpp +++ b/src/helics/application_api/ValueConverter.cpp @@ -304,7 +304,7 @@ namespace detail { // making use of array oriented access for complex numbers // See https://en.cppreference.com/w/cpp/numeric/complex checks::swapBytes<8>(reinterpret_cast(&v)); - checks::swapBytes<8>(reinterpret_cast(&v) + sizeof(double)); + checks::swapBytes<8>(reinterpret_cast(&v) + 8); } } } From 1f5d874e51ab04d572903f7b5528f436ddbc5f70 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 17:06:28 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/helics/application_api/Subscriptions.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/helics/application_api/Subscriptions.hpp b/src/helics/application_api/Subscriptions.hpp index 21e4f51f59..9f5e2528a4 100644 --- a/src/helics/application_api/Subscriptions.hpp +++ b/src/helics/application_api/Subscriptions.hpp @@ -214,7 +214,8 @@ class VectorSubscription2d { static_assert( std::is_base_of>::value, "Second argument must be a pointer to a ValueFederate"); - std::size_t arrayCount=static_cast(count_x) * static_cast(count_y); + std::size_t arrayCount = + static_cast(count_x) * static_cast(count_y); ids.reserve(arrayCount); vals.resize(arrayCount, defValue);