From 6e8742707955833d62ca99da975421cd1ffcf9b2 Mon Sep 17 00:00:00 2001 From: Matt Primrose Date: Mon, 2 Oct 2023 08:16:02 -0700 Subject: [PATCH 1/2] build(ci): adds sca, unit test PR checks to v2.0 --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/go.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 694aa787..394057e4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ main ] + branches: [ main, v2.0 ] pull_request: # The branches below must be a subset of the branches above - branches: [ main ] + branches: [ main, v2.0 ] schedule: - cron: '26 23 * * 0' diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 51ad95b7..aac7eb18 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -9,9 +9,9 @@ name: Go CI on: push: - branches: [main] + branches: [ main, v2.0] pull_request: - branches: [main] + branches: [ main, v2.0] permissions: contents: read From 5ec768a82a96f9cce4c1cc8f8757313a4d71e0c2 Mon Sep 17 00:00:00 2001 From: Matt Primrose Date: Mon, 2 Oct 2023 08:38:13 -0700 Subject: [PATCH 2/2] refactor(format): applies gofmt rules to files --- pkg/amt/alarmclock/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/amt/alarmclock/service.go b/pkg/amt/alarmclock/service.go index e45d3d81..5ffa1e8b 100644 --- a/pkg/amt/alarmclock/service.go +++ b/pkg/amt/alarmclock/service.go @@ -75,7 +75,7 @@ type ( } AddAlarmOutput struct { // A reference to the created instance of IPS_AlarmClockOccurrence. - AlarmClock AlarmClock + AlarmClock AlarmClock // Return code. 0 indicates success ReturnValue int }