Debug: Activate CI

Rohde-Schwarz · Mar 8, 2024 · 1069bdc · 1069bdc
1 parent 28cdd16
commit 1069bdc
Show file tree

Hide file tree

Showing 2 changed files with 138 additions and 138 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ permissions:
 
 on:
   push:
-    branches: [ master ]
+    branches: [ ci/ec/448 ]
   pull_request:
     branches: [ master ]
 
@@ -58,85 +58,85 @@ jobs:
       - name: Build and Test Botan
         run: python3 ./src/scripts/ci_build.py --cc='msvc' --make-tool='ninja' --cpu='${{ matrix.arch }}' --test-results-dir=junit_results ${{ matrix.target }}
 
-  linux:
-    name: "Linux"
-    strategy:
-      fail-fast: false
-
-      matrix:
-        include:
-          - compiler: gcc
-            target: shared
-          - compiler: gcc
-            target: amalgamation
-          - compiler: gcc
-            target: static
-          - compiler: clang
-            target: shared
-
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Build Agent
-        uses: ./.github/actions/setup-build-agent
-        with:
-          target: ${{ matrix.target }}
-          cache-key: linux-${{ matrix.compiler }}-x86_64-${{ matrix.target }}
-
-      - name: Build and Test Botan
-        run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}
-
-  macos:
-    name: "macOS"
-    strategy:
-      fail-fast: false
-
-      matrix:
-        include:
-          - target: shared
-            compiler: clang
-          - target: amalgamation
-            compiler: clang
-
-    runs-on: macos-13
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Build Agent
-        uses: ./.github/actions/setup-build-agent
-        with:
-          target: ${{ matrix.target }}
-          cache-key: macos-${{ matrix.compiler }}-x86_64-${{ matrix.target }}
-
-      - name: Build and Test Botan
-        run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}
-
-  clang-tidy:
-    name: "Clang Tidy"
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Build Agent
-        uses: ./.github/actions/setup-build-agent
-        with:
-          target: clang-tidy
-          cache-key: linux-x86_64-clang-tidy
-
-      - name: Configure Build
-        run: python3 ./configure.py --cc=clang
-
-      - name: Run Clang Tidy
-        run: |
-           ./src/scripts/ci/gh_get_changes_in_pr.py $(git rev-parse HEAD) --api-token=${{ secrets.GITHUB_TOKEN }} | \
-             python3 ./src/scripts/dev_tools/run_clang_tidy.py --verbose --take-file-list-from-stdin --export-fixes-dir=clang_tidy_diagnostics
-
-      - name: Display Clang Tidy Results
-        if: failure()
-        run: ./src/scripts/ci/gh_clang_tidy_fixes_in_pr.py clang_tidy_diagnostics
+  # linux:
+  #   name: "Linux"
+  #   strategy:
+  #     fail-fast: false
+
+  #     matrix:
+  #       include:
+  #         - compiler: gcc
+  #           target: shared
+  #         - compiler: gcc
+  #           target: amalgamation
+  #         - compiler: gcc
+  #           target: static
+  #         - compiler: clang
+  #           target: shared
+
+  #   runs-on: ubuntu-22.04
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Setup Build Agent
+  #       uses: ./.github/actions/setup-build-agent
+  #       with:
+  #         target: ${{ matrix.target }}
+  #         cache-key: linux-${{ matrix.compiler }}-x86_64-${{ matrix.target }}
+
+  #     - name: Build and Test Botan
+  #       run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}
+
+  # macos:
+  #   name: "macOS"
+  #   strategy:
+  #     fail-fast: false
+
+  #     matrix:
+  #       include:
+  #         - target: shared
+  #           compiler: clang
+  #         - target: amalgamation
+  #           compiler: clang
+
+  #   runs-on: macos-13
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Setup Build Agent
+  #       uses: ./.github/actions/setup-build-agent
+  #       with:
+  #         target: ${{ matrix.target }}
+  #         cache-key: macos-${{ matrix.compiler }}-x86_64-${{ matrix.target }}
+
+  #     - name: Build and Test Botan
+  #       run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}
+
+  # clang-tidy:
+  #   name: "Clang Tidy"
+  #   runs-on: ubuntu-22.04
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Setup Build Agent
+  #       uses: ./.github/actions/setup-build-agent
+  #       with:
+  #         target: clang-tidy
+  #         cache-key: linux-x86_64-clang-tidy
+
+  #     - name: Configure Build
+  #       run: python3 ./configure.py --cc=clang
+
+  #     - name: Run Clang Tidy
+  #       run: |
+  #          ./src/scripts/ci/gh_get_changes_in_pr.py $(git rev-parse HEAD) --api-token=${{ secrets.GITHUB_TOKEN }} | \
+  #            python3 ./src/scripts/dev_tools/run_clang_tidy.py --verbose --take-file-list-from-stdin --export-fixes-dir=clang_tidy_diagnostics
+
+  #     - name: Display Clang Tidy Results
+  #       if: failure()
+  #       run: ./src/scripts/ci/gh_clang_tidy_fixes_in_pr.py clang_tidy_diagnostics
 
   analysis:
     name: "Analysis"
@@ -145,31 +145,31 @@ jobs:
 
       matrix:
         include:
-          - target: coverage
-            compiler: gcc
-            host_os: ubuntu-22.04
+          # - target: coverage
+          #   compiler: gcc
+          #   host_os: ubuntu-22.04
           - target: sanitizer
             compiler: msvc
             host_os: windows-2022
             make_tool: ninja
-          - target: sanitizer
-            compiler: clang
-            host_os: ubuntu-22.04
-          - target: sanitizer
-            compiler: gcc
-            host_os: ubuntu-22.04
-          - target: valgrind
-            compiler: gcc
-            host_os: ubuntu-22.04
-          - target: fuzzers
-            compiler: gcc
-            host_os: ubuntu-22.04
-          - target: lint
-            compiler: gcc
-            host_os: ubuntu-22.04
-          - target: format
-            compiler: gcc
-            host_os: ubuntu-22.04
+          # - target: sanitizer
+          #   compiler: clang
+          #   host_os: ubuntu-22.04
+          # - target: sanitizer
+          #   compiler: gcc
+          #   host_os: ubuntu-22.04
+          # - target: valgrind
+          #   compiler: gcc
+          #   host_os: ubuntu-22.04
+          # - target: fuzzers
+          #   compiler: gcc
+          #   host_os: ubuntu-22.04
+          # - target: lint
+          #   compiler: gcc
+          #   host_os: ubuntu-22.04
+          # - target: format
+          #   compiler: gcc
+          #   host_os: ubuntu-22.04
 
     runs-on: ${{ matrix.host_os }}
 
@@ -198,41 +198,41 @@ jobs:
       - name: Build and Test Botan
         run: python3 ./source/src/scripts/ci_build.py --root-dir=${{ github.workspace }}/source --build-dir=${{ github.workspace }}/build --boringssl-dir=${{ github.workspace }}/boringssl --cc='${{ matrix.compiler }}' --make-tool='${{ matrix.make_tool }}' --test-results-dir=junit_results ${{ matrix.target }}
 
-  specials:
-    name: "Special"
-    strategy:
-      fail-fast: false
-
-      matrix:
-        include:
-          - target: examples
-            compiler: gcc
-            host_os: ubuntu-22.04
-          - target: minimized
-            compiler: gcc
-            host_os: ubuntu-22.04
-          - target: bsi
-            compiler: gcc
-            host_os: ubuntu-22.04
-          - target: docs
-            compiler: gcc
-            host_os: ubuntu-22.04
-
-    runs-on: ${{ matrix.host_os }}
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          path: ./source
-
-      - name: Setup Build Agent
-        uses: ./source/.github/actions/setup-build-agent
-        with:
-          target: ${{ matrix.target }}
-          cache-key: ${{ matrix.host_os }}-${{ matrix.compiler }}-x86_64-${{ matrix.target }}
-
-      - name: Build and Test Botan
-        run: python3 ./source/src/scripts/ci_build.py --root-dir=${{ github.workspace }}/source --build-dir=${{ github.workspace }}/build --boringssl-dir=${{ github.workspace }}/boringssl --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}
+  # specials:
+  #   name: "Special"
+  #   strategy:
+  #     fail-fast: false
+
+  #     matrix:
+  #       include:
+  #         - target: examples
+  #           compiler: gcc
+  #           host_os: ubuntu-22.04
+  #         - target: minimized
+  #           compiler: gcc
+  #           host_os: ubuntu-22.04
+  #         - target: bsi
+  #           compiler: gcc
+  #           host_os: ubuntu-22.04
+  #         - target: docs
+  #           compiler: gcc
+  #           host_os: ubuntu-22.04
+
+  #   runs-on: ${{ matrix.host_os }}
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         path: ./source
+
+  #     - name: Setup Build Agent
+  #       uses: ./source/.github/actions/setup-build-agent
+  #       with:
+  #         target: ${{ matrix.target }}
+  #         cache-key: ${{ matrix.host_os }}-${{ matrix.compiler }}-x86_64-${{ matrix.target }}
+
+  #     - name: Build and Test Botan
+  #       run: python3 ./source/src/scripts/ci_build.py --root-dir=${{ github.workspace }}/source --build-dir=${{ github.workspace }}/build --boringssl-dir=${{ github.workspace }}/boringssl --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}
 
   x-compile:
     name: "Cross"

diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
@@ -173,8 +173,8 @@ def sanitize_kv(some_string):
     if ccache is not None:
         flags += ['--no-store-vc-rev', '--compiler-cache=%s' % (ccache)]
 
-    if not disable_werror:
-        flags += ['--werror-mode']
+    # if not disable_werror:
+    #     flags += ['--werror-mode']
 
     if target_cpu is not None:
         flags += ['--cpu=%s' % (target_cpu)]