Skip to content

Commit

Permalink
Merge pull request #52 from wallix/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
bsimonWallix authored Dec 20, 2024
2 parents c81fc1d + 6750e67 commit 402e732
Show file tree
Hide file tree
Showing 13 changed files with 450 additions and 142 deletions.
20 changes: 9 additions & 11 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- name: Set up Go 1.23
uses: actions/setup-go@v5
with:
go-version: '1.23'
go-version: "1.23"
check-latest: true
id: go
- name: Disable cgo
Expand All @@ -27,13 +27,13 @@ jobs:
name: markdown-lint
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Check out code
uses: actions/checkout@v4

- name: Markdown files linting
uses: avto-dev/markdown-lint@v1
with:
args: '.'
- name: Markdown files linting
uses: avto-dev/markdown-lint@v1
with:
args: .

terrafmt:
name: terrafmt
Expand All @@ -42,9 +42,8 @@ jobs:
- name: Set up Go 1.23
uses: actions/setup-go@v5
with:
go-version: '1.23'
go-version: "1.23"
check-latest: true
skip-cache: true
id: go
- name: Show version
run: go version
Expand All @@ -56,7 +55,6 @@ jobs:
repository: katbyte/terrafmt
ref: v0.5.2
path: terrafmt
skip-cache: true
- name: Build terrafmt bin
run: cd terrafmt && go install ./... && cd ${GITHUB_WORKSPACE}
- name: Detect resource/data-source blocks without double quote on type and name (blocks not detected by terrafmt)
Expand All @@ -68,7 +66,7 @@ jobs:
run: find bastion | egrep "_test.go" | sort | while read f; do terrafmt diff $f; done >> /tmp/results.test.go
- name: Generate error if results not empty
run: |
if [[ -s /tmp/results.md || -s /tmp/results.test.go ]] ; then
if [[ -s /tmp/results.md || -s /tmp/results.test.go ]] ; then
cat /tmp/results.md
cat /tmp/results.test.go
echo "terraform blocks in docs/test-go files not being properly formatted"
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,26 @@ name: release
on:
push:
tags:
- 'v*'
- v*
jobs:
goreleaser:
runs-on: ubuntu-latest
steps:
-
name: Checkout
- name: Checkout
uses: actions/checkout@v4
-
name: Unshallow
- name: Unshallow
run: git fetch --prune --unshallow
-
name: Set up Go
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.23'
-
name: Import GPG key
go-version: "1.23"
- name: Import GPG key
uses: crazy-max/[email protected]
id: import_gpg
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.PASSPHRASE }}
-
name: Run GoReleaser
- name: Run GoReleaser
uses: goreleaser/[email protected]
with:
version: latest
Expand Down
Loading

0 comments on commit 402e732

Please sign in to comment.