From 96acb504338e734df919233a27dd52465f449c2d Mon Sep 17 00:00:00 2001 From: "Marcel S. Henselin" Date: Fri, 30 Jan 2026 13:35:36 +0100 Subject: [PATCH] fix: typo in publish command fix: refactor build action --- .github/actions/build/action.yaml | 52 ++++++++++++++++++++++++------- cmd/cmd/publishCmd.go | 2 +- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml index 9da06b1a..fe544618 100644 --- a/.github/actions/build/action.yaml +++ b/.github/actions/build/action.yaml @@ -6,14 +6,24 @@ inputs: description: "Go version to install" default: '1.25' required: true - golang-cilint-version: - description: "Golangci-lint version to install" - default: "2.7.2" - required: true + java-distribution: + description: "JAVA distribution to use (default: temurin)" + default: 'temurin' + java-version: + description: "JAVA version to use (default: 21)" + default: '21' runs: using: "composite" steps: + - name: Install needed tools + shell: bash + run: | + set -e + apt-get -y -qq update + apt-get -y -qq install jq python3 python3-pip python-is-python3 s3cmd git make wget + + - name: Install Go ${{ inputs.go-version }} uses: actions/setup-go@v6 with: @@ -21,14 +31,34 @@ runs: check-latest: true go-version-file: 'go.mod' - # - name: Run golangci-lint - # uses: golangci/golangci-lint-action@v9 - # with: - # version: ${{ inputs.golang-cilint-version }} - - - name: Install needed tools + - name: Install go tools shell: bash run: | set -e - go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${{ inputs.golang-cilint-version }} + go install golang.org/x/tools/cmd/goimports@latest + go install github.com/hashicorp/terraform-plugin-codegen-framework/cmd/tfplugingen-framework@latest + go install github.com/hashicorp/terraform-plugin-codegen-openapi/cmd/tfplugingen-openapi@latest go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@v0.24.0 + + + - name: Setup JAVA ${{ inputs.java-distribution }} ${{ inputs.go-version }} + uses: actions/setup-java@v5 + with: + distribution: ${{ inputs.java-distribution }} # See 'Supported distributions' for available options + java-version: ${{ inputs.java-version }} + + - name: Checkout + uses: actions/checkout@v6 + + - name: Run build pkg directory + shell: bash + run: | + set -e + go run cmd/main.go build + + + - name: Run make to build app + shell: bash + run: | + set -e + make build diff --git a/cmd/cmd/publishCmd.go b/cmd/cmd/publishCmd.go index 1e3ce140..2c9dbc62 100644 --- a/cmd/cmd/publishCmd.go +++ b/cmd/cmd/publishCmd.go @@ -103,7 +103,7 @@ func publish() error { } // Create release dir - only the contents of this need to be uploaded to S3 - log.Printf("* Creating reelase directory") + log.Printf("* Creating release directory") err = os.MkdirAll(path.Join(p.RootPath, "release"), os.ModePerm) if err != nil && !errors.Is(err, fs.ErrExist) { return fmt.Errorf("error creating '%s' dir: %w", path.Join(p.RootPath, "release"), err)