Chore/move golang code

.github/dependabot.yml

@@ -24,7 +24,7 @@ updates:
           - 'patch'
 
   - package-ecosystem: gomod
-    directory: '/action'
+    directory: '/cmd/firmware-action'
     schedule:
       interval: 'daily'
       time: '00:00'

.github/labeler.yml

@@ -6,8 +6,8 @@ dependencies:
       - changed-files:
           - any-glob-to-any-file:
               - '.dagger-ci/daggerci/requirements.txt'
-              - 'action/go.mod'
-              - 'action/go.sum'
+              - 'cmd/firmware-action/go.mod'
+              - 'cmd/firmware-action/go.sum'
 docker:
   - any:
       - changed-files:
@@ -37,38 +37,38 @@ go:
       - changed-files:
           - any-glob-to-any-file:
               - '*.go'
-              - 'action/.golangci.yml'
-              - 'action/.goreleaser.yaml'
-              - 'action/go.mod'
-              - 'action/go.sum'
+              - 'cmd/firmware-action/.golangci.yml'
+              - 'cmd/firmware-action/.goreleaser.yaml'
+              - 'cmd/firmware-action/go.mod'
+              - 'cmd/firmware-action/go.sum'
 module/coreboot:
   - any:
       - changed-files:
           - any-glob-to-any-file:
-              - 'action/recipes/coreboot*'
+              - 'cmd/firmware-action/recipes/coreboot*'
               - 'docker/coreboot/**'
 module/edk2:
   - any:
       - changed-files:
           - any-glob-to-any-file:
-              - 'action/recipes/edk2*'
+              - 'cmd/firmware-action/recipes/edk2*'
               - 'docker/edk2/**'
 module/linux:
   - any:
       - changed-files:
           - any-glob-to-any-file:
-              - 'action/recipes/linux*'
+              - 'cmd/firmware-action/recipes/linux*'
               - 'docker/linux/**'
 module/stitching:
   - any:
       - changed-files:
           - any-glob-to-any-file:
-              - 'action/recipes/stitching*'
+              - 'cmd/firmware-action/recipes/stitching*'
 module/u-root:
   - any:
       - changed-files:
           - any-glob-to-any-file:
-              - 'action/recipes/uroot*'
+              - 'cmd/firmware-action/recipes/uroot*'
               - 'docker/uroot/**'
 python:
   - any:
@@ -89,7 +89,7 @@ testing:
               - '.markdownlint.json'
               - '.mega-linter.yml'
               - '.trivy.yaml'
-              - 'action/**/*_test.go'
+              - 'cmd/firmware-action/**/*_test.go'
               - 'tests/**'
       - head-branch:
           - '^test'

.github/workflows/example.yml

@@ -64,7 +64,7 @@ jobs:
               - 'docker/**'
               - 'tests/**'
               - 'action.yml'
-              - 'action/**'
+              - 'cmd/firmware-action/**'
 
   # Change detection in action golang code
   changes:
@@ -94,7 +94,7 @@ jobs:
         with:
           filters: |
             action:
-              - 'action/**'
+              - 'cmd/firmware-action/**'
       - name: Compile
         id: compile
         # Require compilation if changes in action golang code or if any breaking changes since last release

.github/workflows/go-test.yml

@@ -49,13 +49,14 @@ jobs:
           filters: |
             changes:
               - '.github/workflows/go-test.yml'
-              - 'action/**'
+              - 'cmd/firmware-action/**'
 
   go-test-resource-hogs:
     # Run tests that take up a lot of system resources separately
     runs-on: ubuntu-latest
     needs: skip-check
     strategy:
+      fail-fast: false
       matrix:
         testregex: ['TestLinux', 'TestEdk2', 'TestCoreboot', 'TestStitching', 'TestURoot', 'TestUniversal']
     if: ${{ ! (github.event_name == 'pull_request_review' && github.actor != 'github-actions[bot]') && needs.skip-check.outputs.changes == 'true' }}
@@ -69,11 +70,11 @@ jobs:
           go-version: stable
       - name: Install go dependencies
         run: |
-          cd action
+          cd cmd/firmware-action
           go get -d ./...
       - name: Run go test
         run: |
-          cd action
+          cd cmd/firmware-action
           go test -race -v -timeout 60m -shuffle=on -covermode=atomic -coverprofile coverage.out -run ${{ matrix.testregex }} ./...
 
   go-test:
@@ -91,9 +92,9 @@ jobs:
           go-version: stable
       - name: Install go dependencies
         run: |
-          cd action
+          cd cmd/firmware-action
           go get -d ./...
       - name: Run go test
         run: |
-          cd action
+          cd cmd/firmware-action
           go test -race -v -timeout 60m -shuffle=on -covermode=atomic -coverprofile coverage.out -skip '(TestLinux|TestEdk2|TestCoreboot|TestStitching|TestUniversal)' ./...

.github/workflows/lint.yml

@@ -66,4 +66,4 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         with:
           version: latest
-          working-directory: action
+          working-directory: cmd/firmware-action

.github/workflows/release-prepare.yml

@@ -34,7 +34,7 @@ jobs:
       # Bump version
       - name: Update main.go
         run: |
-          sed -i -E 's/const firmwareActionVersion = .*/const firmwareActionVersion = "${{ steps.semver.outputs.next }}"/g' action/main.go
+          sed -i -E 's/const firmwareActionVersion = .*/const firmwareActionVersion = "${{ steps.semver.outputs.next }}"/g' cmd/firmware-action/main.go
       - name: Update Taskfile.yml
         run: |
           sed -i -E "s/^  SEMVER: .*/  SEMVER: '${{ steps.semver.outputs.next }}'/g" Taskfile.yml

.github/workflows/release.yml

@@ -43,7 +43,7 @@ jobs:
         run: |
           git branch --show-current
           git pull
-          echo "version=$(grep 'const firmwareActionVersion' < action/main.go | sed -E 's/.*= "//g' | sed 's/"//g')" >> "${GITHUB_OUTPUT}"
+          echo "version=$(grep 'const firmwareActionVersion' < cmd/firmware-action/main.go | sed -E 's/.*= "//g' | sed 's/"//g')" >> "${GITHUB_OUTPUT}"
           # Can't really use cocogitto here
 
       - name: Create tag

.gitignore

@@ -1,11 +1,11 @@
 .coverage
 .task
 .example_runs
-action/coverage.html
-action/coverage.out
+cmd/firmware-action/coverage.html
+cmd/firmware-action/coverage.out
 bin/
 megalinter-reports
 node_modules
-action/recipes/__tmp_files__/
+cmd/firmware-action/recipes/__tmp_files__/
 output-*/
 docker/coreboot/coreboot-*

Taskfile.yml

@@ -2,6 +2,7 @@
 version: '3'
 vars:
   SEMVER: 'v0.10.2'
+  GOLANG_CODE_PATH: 'cmd/firmware-action'
 
 includes:
   containers:
@@ -17,19 +18,19 @@ includes:
 tasks:
   build-go-binary:
     desc: Template task to build a go binary
-    dir: action
+    dir: '{{.GOLANG_CODE_PATH}}'
     cmds:
-      - go build -ldflags="-s -w" -o ../bin/firmware-action-{{OS}}-{{ARCH}}-{{.SEMVER}}
+      - go build -ldflags="-s -w" -o ../../bin/firmware-action-{{OS}}-{{ARCH}}-{{.SEMVER}}
     env:
       CGO_ENABLED: 0
     sources:
       - ./**/*.go
     generates:
-      - ../bin/firmware-action-{{OS}}-{{ARCH}}-{{.SEMVER}}
+      - ../../bin/firmware-action-{{OS}}-{{ARCH}}-{{.SEMVER}}
 
   lint:
     desc: Run the linters
-    dir: action
+    dir: '{{.GOLANG_CODE_PATH}}'
     cmds:
       - revive ./...
       - go vet ./...
@@ -39,19 +40,19 @@ tasks:
   format:
     desc: Run gofumt (fork of gofmt, stricter)
     cmds:
-      - gofumpt -w action
+      - gofumpt -w '{{.GOLANG_CODE_PATH}}'
 
   test:
     desc: Run tests
-    dir: action
+    dir: '{{.GOLANG_CODE_PATH}}'
     cmds:
       - go test {{.CLI_ARGS}} -race -timeout 60m -shuffle=on -covermode=atomic -coverprofile coverage.out ./...
       - go tool cover -func=coverage.out
       - go tool cover -html=coverage.out -o coverage.html
 
   godocs:
     desc: Start godocs http server
-    dir: action
+    dir: '{{.GOLANG_CODE_PATH}}'
     cmds:
       - godoc -http=:6060
 

action.yml

@@ -93,9 +93,9 @@ runs:
     - name: compile_unix
       if: ${{ ( runner.os == 'Linux' || runner.os == 'macOS' ) && inputs.compile == 'true' }}
       shell: bash
-      working-directory: ./action
+      working-directory: ./cmd/firmware-action
       run: |
-        go build -ldflags="-s -w" -o ../firmware-action
+        go build -ldflags="-s -w" -o ../../firmware-action
 
     - id: fetch_windows
       if: ${{ runner.os == 'Windows' && inputs.compile == 'false' }}
@@ -106,9 +106,9 @@ runs:
     - name: compile_windows
       if: ${{ runner.os == 'Windows' && inputs.compile == 'true' }}
       shell: pwsh
-      working-directory: ./action
+      working-directory: ./cmd/firmware-action
       run: |
-        go build -ldflags="-s -w" -o ../firmware-action.exe
+        go build -ldflags="-s -w" -o ../../firmware-action.exe
 
     - name: run_unix
       if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}

action/container/container.go → cmd/firmware-action/container/container.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/logging"
+	"github.com/9elements/firmware-action/logging"
 )
 
 var (

action/container/container_test.go → cmd/firmware-action/container/container_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/filesystem"
+	"github.com/9elements/firmware-action/filesystem"
 	"github.com/stretchr/testify/assert"
 )
 

action/go.mod → cmd/firmware-action/go.mod

@@ -1,4 +1,4 @@
-module github.com/9elements/firmware-action/action
+module github.com/9elements/firmware-action
 
 go 1.22.5
 

action/logging/logging.go → cmd/firmware-action/logging/logging.go

@@ -36,7 +36,7 @@ func InitLogger(level slog.Level, opts ...PrettyHandlerOption) {
 // TrimNameFunction just trims the name
 func TrimNameFunction(pc uintptr) string {
 	// 'runtime.FuncForPC(pc).Name()' is nice and all, but it will return this monstrosity:
-	//   github.com/9elements/firmware-action/action/<package>.<func>...
+	//   github.com/9elements/firmware-action/<package>.<func>...
 	// So this function is just to trim it down
 	// Usage:
 	//   pc, _, _, _ := runtime.Caller(0)

action/main.go → cmd/firmware-action/main.go

@@ -13,9 +13,9 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/9elements/firmware-action/action/filesystem"
-	"github.com/9elements/firmware-action/action/logging"
-	"github.com/9elements/firmware-action/action/recipes"
+	"github.com/9elements/firmware-action/filesystem"
+	"github.com/9elements/firmware-action/logging"
+	"github.com/9elements/firmware-action/recipes"
 	"github.com/alecthomas/kong"
 	"github.com/go-git/go-git/v5"
 	"github.com/jedib0t/go-pretty/v6/table"

action/recipes/config.go → cmd/firmware-action/recipes/config.go

@@ -15,8 +15,8 @@ import (
 	"strings"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/container"
-	"github.com/9elements/firmware-action/action/logging"
+	"github.com/9elements/firmware-action/container"
+	"github.com/9elements/firmware-action/logging"
 	"github.com/go-playground/validator/v10"
 )
 

action/recipes/coreboot.go → cmd/firmware-action/recipes/coreboot.go

@@ -15,9 +15,9 @@ import (
 	"strings"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/container"
-	"github.com/9elements/firmware-action/action/filesystem"
-	"github.com/9elements/firmware-action/action/logging"
+	"github.com/9elements/firmware-action/container"
+	"github.com/9elements/firmware-action/filesystem"
+	"github.com/9elements/firmware-action/logging"
 )
 
 // BlobDef is used to store information about a single blob.

action/recipes/coreboot_test.go → cmd/firmware-action/recipes/coreboot_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/filesystem"
+	"github.com/9elements/firmware-action/filesystem"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 )
@@ -140,7 +140,7 @@ func TestCoreboot(t *testing.T) {
 			assert.NoError(t, err)
 
 			// Copy over defconfig file into tmpDir
-			repoRootPath, err := filepath.Abs(filepath.Join(pwd, "../.."))
+			repoRootPath, err := filepath.Abs(filepath.Join(pwd, "../../.."))
 			assert.NoError(t, err)
 			//   repoPath = path to end user repository (in this case somewhere in /tmp)
 			//   repoRootPath    = path to our repository with this code (contains configuration files for testing)

action/recipes/edk2.go → cmd/firmware-action/recipes/edk2.go

@@ -12,7 +12,7 @@ import (
 	"runtime"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/container"
+	"github.com/9elements/firmware-action/container"
 )
 
 // ANCHOR: Edk2Specific

action/recipes/linux.go → cmd/firmware-action/recipes/linux.go

@@ -15,8 +15,8 @@ import (
 	"strings"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/container"
-	"github.com/9elements/firmware-action/action/logging"
+	"github.com/9elements/firmware-action/container"
+	"github.com/9elements/firmware-action/logging"
 )
 
 var errUnknownArchCrossCompile = errors.New("unknown architecture for cross-compilation")

action/recipes/linux_test.go → cmd/firmware-action/recipes/linux_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/filesystem"
+	"github.com/9elements/firmware-action/filesystem"
 	"github.com/Masterminds/semver"
 	"github.com/stretchr/testify/assert"
 )
@@ -129,7 +129,7 @@ func TestLinux(t *testing.T) {
 
 			// Copy over defconfig file into tmpDir/linux
 			defconfigPath := filepath.Join(myLinuxOpts.RepoPath, myLinuxOpts.DefconfigPath)
-			repoRootPath, err := filepath.Abs(filepath.Join(pwd, "../.."))
+			repoRootPath, err := filepath.Abs(filepath.Join(pwd, "../../.."))
 			assert.NoError(t, err)
 			//   common.RepoPath = path to end user repository (in this case somewhere in /tmp)
 			//   repoRootPath    = path to our repository with this code (contains configuration files for testing)

action/recipes/recipes.go → cmd/firmware-action/recipes/recipes.go

@@ -15,8 +15,8 @@ import (
 	"sync"
 
 	"dagger.io/dagger"
-	"github.com/9elements/firmware-action/action/container"
-	"github.com/9elements/firmware-action/action/filesystem"
+	"github.com/9elements/firmware-action/container"
+	"github.com/9elements/firmware-action/filesystem"
 	"github.com/heimdalr/dag"
 )