Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: Lint
# used as pull request required check

on:
push:
pull_request:

jobs:
lint:
name: Run on Ubuntu
name: Lint
runs-on: ubuntu-latest
steps:
- name: Clone the code
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
test:
name: Test
name: Pre-Release Test
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: Tests
# used as pull request required check

on:
push:
pull_request:

jobs:
test:
name: Run on Ubuntu
name: Test
runs-on: ubuntu-latest
steps:
- name: Clone the code
Expand Down
2 changes: 1 addition & 1 deletion internal/reconciler/orgrec/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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},
},
}
Expand Down
Loading