Skip to content

Commit

Permalink
Update github runners (#5)
Browse files Browse the repository at this point in the history
Remove all hollow references.
Need to move from rivets controller to ctrl to do so. This is a "stepping stone" for later work.
  • Loading branch information
jakeschuurmans authored Sep 24, 2024
1 parent ffefe67 commit a39842b
Show file tree
Hide file tree
Showing 12 changed files with 583 additions and 281 deletions.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#### What does this PR do

77 changes: 77 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '34 3 * * 0'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Go
uses: actions/setup-go@v5
with:
go-version-file: go.mod

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
61 changes: 61 additions & 0 deletions .github/workflows/push-pr-lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: lint, test and build image
on: [pull_request, push]

jobs:
lint-test:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install Go
uses: actions/setup-go@v5
with:
go-version-file: go.mod

- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
args: --config .golangci.yml --timeout 2m
version: v1.61.0

- name: Test
run: go test ./...

build:
runs-on: ubuntu-latest
needs: [lint-test]
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install Go
uses: actions/setup-go@v5
with:
go-version-file: go.mod

- name: build binary
run: make build-linux

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build bioscfg Docker image - no push
id: dockerbuild-bioscfg
uses: docker/build-push-action@v5
with:
context: .
push: false
file: Dockerfile

- name: Scan image - bioscfg
id: scan-bioscfg-image
uses: anchore/scan-action@v3
with:
image: ghcr.io/metal-toolbox/bioscfg:latest
acs-report-enable: true
fail-build: false

- name: Inspect action SARIF report
run: cat ${{ steps.scan.outputs.sarif }}
if: always()
47 changes: 47 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: release

on:
push:
tags:
- 'v*.*.*'

jobs:
goreleaser:
runs-on: ubuntu-latest
permissions:
contents: write
id-token: write
packages: write
steps:
-
name: Login to GHCR
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
-
name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: go.mod
-
name: install cosign
uses: sigstore/cosign-installer@main
-
uses: anchore/sbom-action/[email protected]
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v6
with:
version: latest
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COSIGN_EXPERIMENTAL: 1
GOVERSION: "1.20"
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ REPO := "https://github.com/metal-toolbox/bioscfg.git"

## lint
lint: gen-mock
golangci-lint run --config .golangci.yml
golangci-lint run --config .golangci.yml --fix

## Go test
test: lint
Expand Down
14 changes: 7 additions & 7 deletions cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/metal-toolbox/bioscfg/internal/profiling"
"github.com/metal-toolbox/bioscfg/internal/store"
"github.com/metal-toolbox/bioscfg/internal/version"
"github.com/metal-toolbox/rivets/events/controller"
"github.com/metal-toolbox/ctrl"
)

func runWorker(ctx context.Context, args *model.Args) error {
Expand Down Expand Up @@ -60,17 +60,17 @@ func runWorker(ctx context.Context, args *model.Args) error {
cancel()
}()

nc := controller.NewNatsController(
nc := ctrl.NewNatsController(
model.AppName,
config.FacilityCode,
model.AppSubject,
config.NatsConfig.NatsURL,
config.NatsConfig.CredsFile,
model.AppSubject,
controller.WithConcurrency(config.Concurrency),
controller.WithKVReplicas(config.NatsConfig.KVReplicas),
controller.WithConnectionTimeout(config.NatsConfig.ConnectTimeout),
controller.WithLogger(log.NewLogrusLogger(config.LogLevel)),
ctrl.WithConcurrency(config.Concurrency),
ctrl.WithKVReplicas(config.NatsConfig.KVReplicas),
ctrl.WithConnectionTimeout(config.NatsConfig.ConnectTimeout),
ctrl.WithLogger(log.NewLogrusLogger(config.LogLevel)),
)

if err = nc.Connect(ctx); err != nil {
Expand All @@ -80,7 +80,7 @@ func runWorker(ctx context.Context, args *model.Args) error {

slog.With(version.Current().AsLogFields()...).Info("bioscfg worker running")

err = nc.ListenEvents(ctx, func() controller.ConditionHandler {
err = nc.ListenEvents(ctx, func() ctrl.TaskHandler {
return handlers.NewHandlerFactory(repository)
})
if err != nil {
Expand Down
Loading

0 comments on commit a39842b

Please sign in to comment.