From 2640accf87cf325775ba827c8f21027041fca257 Mon Sep 17 00:00:00 2001 From: Seun Akanni Date: Tue, 18 Aug 2026 12:19:13 +0100 Subject: [PATCH 1/2] ci: control run, unmodified base with beta bundle --- .github/workflows/ci-beta.yml | 138 +++++++++++++++++++++++++++++++ Structure_Engine/Query/Length.cs | 1 + 2 files changed, 139 insertions(+) create mode 100644 .github/workflows/ci-beta.yml create mode 100644 Structure_Engine/Query/Length.cs diff --git a/.github/workflows/ci-beta.yml b/.github/workflows/ci-beta.yml new file mode 100644 index 000000000..b7aa58acf --- /dev/null +++ b/.github/workflows/ci-beta.yml @@ -0,0 +1,138 @@ +# Beta-tier proxy, BHoM variant. Bundles the tier's checks plus +# copyright-compliance (BHoM enforces OSS copyright; the BHE variant omits it). +# Copy to .github/workflows/ci-beta.yml in each BHoM beta repo. +# Runs on pull_request, non-blocking until a ruleset requires its checks. +# Workflow name CI keeps check contexts bare: required contexts are the job names. + +name: CI + +on: + pull_request: + branches: + - dstest/base + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }} + cancel-in-progress: true + +jobs: + ci-build: + runs-on: windows-2025-vs2026 + timeout-minutes: 30 + steps: + - name: Run build + uses: BHoM/CI_Toolkit/.github/actions/ci-build@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + ci-code-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run code compliance + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: code + patterns: '*.cs' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + ci-copyright-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run copyright compliance + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: copyright + patterns: '*.cs' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + ci-dataset-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run dataset compliance + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: dataset + patterns: ':(icase)*datasets*.json' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + ci-documentation-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run documentation compliance + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: documentation + patterns: '*.cs' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + ci-project-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run project compliance + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: project + patterns: '*AssemblyInfo.cs *.csproj' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + ci-dataset-tests: + runs-on: windows-2025-vs2026 + timeout-minutes: 30 + steps: + - name: Run dataset tests + uses: BHoM/CI_Toolkit/.github/actions/ci-dataset-tests@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + ci-serialisation: + runs-on: windows-2025-vs2026 + timeout-minutes: 90 + steps: + - name: Run serialisation + uses: BHoM/CI_Toolkit/.github/actions/ci-serialisation@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + base_ref: ${{ github.base_ref }} + + ci-versioning: + runs-on: windows-2025-vs2026 + timeout-minutes: 90 + steps: + - name: Run versioning + uses: BHoM/CI_Toolkit/.github/actions/ci-versioning@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} diff --git a/Structure_Engine/Query/Length.cs b/Structure_Engine/Query/Length.cs new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Structure_Engine/Query/Length.cs @@ -0,0 +1 @@ + From 2ca16b015d58e7bb7b3618752966c7639bc54c54 Mon Sep 17 00:00:00 2001 From: Seun Akanni Date: Tue, 18 Aug 2026 14:01:46 +0100 Subject: [PATCH 2/2] test: resolve ci-compliance through the legacy Admin path --- .github/workflows/ci-beta.yml | 119 +--------------------------------- 1 file changed, 2 insertions(+), 117 deletions(-) diff --git a/.github/workflows/ci-beta.yml b/.github/workflows/ci-beta.yml index b7aa58acf..e266e1cbb 100644 --- a/.github/workflows/ci-beta.yml +++ b/.github/workflows/ci-beta.yml @@ -1,9 +1,3 @@ -# Beta-tier proxy, BHoM variant. Bundles the tier's checks plus -# copyright-compliance (BHoM enforces OSS copyright; the BHE variant omits it). -# Copy to .github/workflows/ci-beta.yml in each BHoM beta repo. -# Runs on pull_request, non-blocking until a ruleset requires its checks. -# Workflow name CI keeps check contexts bare: required contexts are the job names. - name: CI on: @@ -11,85 +5,7 @@ on: branches: - dstest/base -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }} - cancel-in-progress: true - jobs: - ci-build: - runs-on: windows-2025-vs2026 - timeout-minutes: 30 - steps: - - name: Run build - uses: BHoM/CI_Toolkit/.github/actions/ci-build@develop - with: - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - - ci-code-compliance: - runs-on: windows-2025-vs2026 - timeout-minutes: 20 - permissions: - contents: read - pull-requests: read - actions: write - steps: - - name: Run code compliance - uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop - with: - check_type: code - patterns: '*.cs' - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - - ci-copyright-compliance: - runs-on: windows-2025-vs2026 - timeout-minutes: 20 - permissions: - contents: read - pull-requests: read - actions: write - steps: - - name: Run copyright compliance - uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop - with: - check_type: copyright - patterns: '*.cs' - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - - ci-dataset-compliance: - runs-on: windows-2025-vs2026 - timeout-minutes: 20 - permissions: - contents: read - pull-requests: read - actions: write - steps: - - name: Run dataset compliance - uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop - with: - check_type: dataset - patterns: ':(icase)*datasets*.json' - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - - ci-documentation-compliance: - runs-on: windows-2025-vs2026 - timeout-minutes: 20 - permissions: - contents: read - pull-requests: read - actions: write - steps: - - name: Run documentation compliance - uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop - with: - check_type: documentation - patterns: '*.cs' - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - ci-project-compliance: runs-on: windows-2025-vs2026 timeout-minutes: 20 @@ -98,41 +14,10 @@ jobs: pull-requests: read actions: write steps: - - name: Run project compliance - uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop + - name: Run project compliance via the ADMIN path (redirect test) + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop with: check_type: project patterns: '*AssemblyInfo.cs *.csproj' app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - - ci-dataset-tests: - runs-on: windows-2025-vs2026 - timeout-minutes: 30 - steps: - - name: Run dataset tests - uses: BHoM/CI_Toolkit/.github/actions/ci-dataset-tests@develop - with: - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - - ci-serialisation: - runs-on: windows-2025-vs2026 - timeout-minutes: 90 - steps: - - name: Run serialisation - uses: BHoM/CI_Toolkit/.github/actions/ci-serialisation@develop - with: - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - base_ref: ${{ github.base_ref }} - - ci-versioning: - runs-on: windows-2025-vs2026 - timeout-minutes: 90 - steps: - - name: Run versioning - uses: BHoM/CI_Toolkit/.github/actions/ci-versioning@develop - with: - app_id: ${{ secrets.BHOM_APP_ID }} - private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }}