From 5ab9b3c0d5ce257dc0aa2e72ebd5544e5c5f2367 Mon Sep 17 00:00:00 2001 From: tstollin Date: Wed, 13 May 2026 13:56:05 +0200 Subject: [PATCH] fix: reactivate code security configuration reconciliation, rename some workflow jobs CSC reconciliation had been disabled because we received HTTP 500 from GitHub upon update. This issue seems to have been fixed. --- .github/workflows/lint.yml | 3 ++- .github/workflows/release.yml | 8 +++++--- .github/workflows/test-e2e.yml | 2 +- .github/workflows/test.yml | 3 ++- internal/reconciler/orgrec/reconciler.go | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 511dadb..81de245 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,5 @@ name: Lint +# used as pull request required check on: push: @@ -6,7 +7,7 @@ on: jobs: lint: - name: Run on Ubuntu + name: Lint runs-on: ubuntu-latest steps: - name: Clone the code diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2beea1f..fe40f6d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ env: jobs: test: - name: Test + name: Pre-Release Test runs-on: ubuntu-latest steps: - name: Checkout code @@ -27,8 +27,10 @@ jobs: with: go-version-file: go.mod - - name: Run tests - run: make test + - name: Running Tests + run: | + go mod tidy + make test build-and-publish: name: Build & Publish Image diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 3e71c86..0401f6b 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -6,7 +6,7 @@ on: jobs: test-e2e: - name: Run on Ubuntu + name: Test e2e runs-on: ubuntu-latest if: false # disabled until fixed steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 415418d..25c4da5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,5 @@ name: Tests +# used as pull request required check on: push: @@ -6,7 +7,7 @@ on: jobs: test: - name: Run on Ubuntu + name: Test runs-on: ubuntu-latest steps: - name: Clone the code diff --git a/internal/reconciler/orgrec/reconciler.go b/internal/reconciler/orgrec/reconciler.go index 4d16976..b3705f9 100644 --- a/internal/reconciler/orgrec/reconciler.go +++ b/internal/reconciler/orgrec/reconciler.go @@ -52,7 +52,7 @@ func (o *GitHubOrgReconciler) RequiredReconciliations() []reconciler.ParallelRec {Function: o.reconcileOrganization, Condition: conditions.TypeBaseSettingsSynced}, {Function: o.reconcileCustomProperties, Condition: conditions.TypeCustomPropertyDefinitionsSynced}, {Function: o.reconcileRulesetPresets, Condition: conditions.TypeRulesetsSynced}, - // {Function: o.reconcileCodeSecurityConfigurations, Condition: conditions.TypeCodeSecurityConfigurationsSynced}, + {Function: o.reconcileCodeSecurityConfigurations, Condition: conditions.TypeCodeSecurityConfigurationsSynced}, {Function: o.reconcileActionsSettings, Condition: conditions.TypeActionsConfigurationSynced}, }, }