diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fce8e42e8..285318951 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,10 +1,9 @@ name: "CodeQL Analysis" on: - push: - branches: [master] + workflow_dispatch: pull_request: - # The branches below must be a subset of the branches above + push: branches: [master] concurrency: @@ -47,23 +46,13 @@ jobs: - name: Checkout git repo uses: actions/checkout@v3 - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + 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. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # â„šī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/job-test-mac.yml b/.github/workflows/job-test-mac.yml index 009457b22..857e7047b 100644 --- a/.github/workflows/job-test-mac.yml +++ b/.github/workflows/job-test-mac.yml @@ -23,12 +23,12 @@ jobs: matrix: runtime: - name: "macos-10-intel" - os: "macos-latest" + os: "macos-14-large" arch: x64 target: "10.14" shell: "bash" - name: "macos-11-m1" - os: "macos-latest-xlarge" + os: "macos-14" arch: arm64 target: "11" shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}" @@ -54,20 +54,16 @@ jobs: with: submodules: "recursive" - - name: Install brew dependencies - run: brew bundle --file=- <<< "brew 'qt5'; brew 'openssl'" + - name: Install Qt5 + run: brew install qt@5 - - name: Build + - name: Configure env: CMAKE_OSX_DEPLOYMENT_TARGET: ${{ matrix.runtime.target }} - run: | - mkdir build - cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH="$(brew --prefix qt5);$(brew --prefix openssl)" .. - . ./version - make -j + run: cmake -B build --preset=macos-release -DCMAKE_PREFIX_PATH=$(brew --prefix qt@5) + + - name: Build + run: cmake --build build - name: Run unit test run: ./build/bin/unittests diff --git a/.github/workflows/job-sonarcloud.yml b/.github/workflows/sonarcloud-analysis.yml similarity index 100% rename from .github/workflows/job-sonarcloud.yml rename to .github/workflows/sonarcloud-analysis.yml