Skip to content

Commit

Permalink
Merge branch 'main' into DEV-2229
Browse files Browse the repository at this point in the history
  • Loading branch information
osterman authored Jan 31, 2025
2 parents 49f7c42 + 4a129d0 commit b4d5a38
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 26 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
# The workflow name **must** be "autofix.ci" for Autofix CI to function correctly.
# Any deviation from this name will cause Autofix CI to fail, as it relies on this
# specific identifier for execution. This is a strict requirement of Autofix CI.
name: autofix.ci
on: pull_request
permissions: {}
jobs:
autofix:
runs-on: ubuntu-24.04
permissions: {}
timeout-minutes: 15
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- uses: aquaproj/aqua-installer@e2d0136abcf70b7a2f6f505720640750557c4b33 # v3.1.1
with:
aqua_version: v2.43.0

- name: Update aqua-checksums.json
run: aqua upc -prune

# go mod tidy
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version-file: go.mod
- run: go mod tidy

# gofumpt
- name: Get changed Go files
id: changed-files
uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f # v45.0.6
with:
use_rest_api: "true"
files: |
**/*.go
- if: steps.changed-files.outputs.all_changed_files_count != '0'
env:
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
run: |
# shellcheck disable=SC2086
gofumpt -l -w $ALL_CHANGED_FILES
- uses: autofix-ci/action@2891949f3779a1cafafae1523058501de3d4e944 # v1.3.1
19 changes: 0 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,6 @@ jobs:
path: |
./build/
tidy:
name: Tidy Go Modules
runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
id: go

- uses: j0hnsmith/go-mod-check@v1
with:
working-directory: ${{ github.workspace }}
# optional, only if you're happy to have `replace ` lines in your go.mod file
skip-replace-check: true

# run acceptance tests
test:
name: Acceptance Tests
Expand Down
10 changes: 3 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@ SHELL := /bin/bash
VERSION=test

export CGO_ENABLED=0
# List of targets the `readme` target should call before generating the readme
export README_DEPS ?= docs/targets.md

-include $(shell curl -sSL -o .build-harness "https://cloudposse.tools/build-harness"; echo .build-harness)

## Lint terraform code
lint:
$(SELF) terraform/install terraform/get-modules terraform/get-plugins terraform/lint terraform/validate
readme:
@echo "README.md generation temporarily disabled."
@exit 0

get:
go get
Expand Down
34 changes: 34 additions & 0 deletions aqua/aqua-checksums.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"checksums": [
{
"id": "github_release/github.com/mvdan/gofumpt/v0.7.0/gofumpt_v0.7.0_darwin_amd64",
"checksum": "B7D05E092DA45C5EC96344AB635B1D6547C3E27C840BA39BC76989934EFD7CE3",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/mvdan/gofumpt/v0.7.0/gofumpt_v0.7.0_darwin_arm64",
"checksum": "08F23114760A090B090706D92B8C52B9875B9EB352D76C77AA354D6AA20B045A",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/mvdan/gofumpt/v0.7.0/gofumpt_v0.7.0_linux_amd64",
"checksum": "6FF459C1DCAE3B0B00844C1A5A4A5B0F547237D8A4F3624AAEA8D424AEEF24C6",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/mvdan/gofumpt/v0.7.0/gofumpt_v0.7.0_linux_arm64",
"checksum": "00C18C88EF50437629626BA20D677F4648684CB280952814CDD887677D42CBD3",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/mvdan/gofumpt/v0.7.0/gofumpt_v0.7.0_windows_amd64.exe",
"checksum": "65F5B9EA7723AA936FA6880E184624747E9E6481802B62D4CB5B774EF2350CEC",
"algorithm": "sha256"
},
{
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.302.1/registry.yaml",
"checksum": "908B44E94A3583AA2D6F0B17F53E49D01ACD57E4ECDFEDB29EB082D335D9445478426E591AB57D37BAA02A2EF9581A71A3AA66C825CC787323D65A1D89B53072",
"algorithm": "sha512"
}
]
}
12 changes: 12 additions & 0 deletions aqua/aqua.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/aqua-yaml.json
# aqua - Declarative CLI Version Manager
# https://aquaproj.github.io/
checksum:
enabled: true
require_checksum: true
registries:
- type: standard
ref: v4.302.1 # renovate: depName=aquaproj/aqua-registry
packages:
- import: imports/*.yaml
2 changes: 2 additions & 0 deletions aqua/imports/gofumpt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
packages:
- name: mvdan/[email protected]

0 comments on commit b4d5a38

Please sign in to comment.