Skip to content

Commit 2632095

Browse files
authored
Merge pull request #75 from IvanOfThings/fixing-actions
feat: Fixing actions
2 parents ebe546d + a4871cd commit 2632095

File tree

3 files changed

+53
-34
lines changed

3 files changed

+53
-34
lines changed

.github/workflows/merge-content-to-project.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
permissions:
1010
contents: write # needed for creating tags and releases
11+
actions: write # needed for triggering other workflows
1112

1213
jobs:
1314
merge-content-to-project:
@@ -25,4 +26,4 @@ jobs:
2526
run: npx semantic-release --debug
2627
env:
2728
# Use PAT to allow triggering other workflows
28-
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
29+
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN || secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,21 @@ on:
1515
push:
1616
tags:
1717
- "v*"
18+
workflow_run:
19+
workflows: ["Creating version with semantic release on merging Issues/PRs"]
20+
types:
21+
- completed
22+
branches: [master]
1823
permissions:
1924
contents: write
2025
jobs:
2126
goreleaser:
2227
runs-on: ubuntu-latest
28+
# Only run if the workflow was successful and triggered by workflow_run, or if triggered by tag push
29+
if: >
30+
(github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') ||
31+
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) ||
32+
(github.event_name == 'workflow_dispatch')
2333
steps:
2434
- name: Checkout
2535
uses: actions/checkout@v4

.goreleaser.yml

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,53 @@
11
# Visit https://goreleaser.com for documentation on how to customize this
22
# behavior.
3+
version: 2
4+
35
before:
46
hooks:
57
# this is just an example and not a requirement for provider building/publishing
68
- go mod tidy
9+
710
builds:
8-
- env:
9-
# goreleaser does not work with CGO, it could also complicate
10-
# usage by users in CI/CD systems like Terraform Cloud where
11-
# they are unable to install libraries.
12-
- CGO_ENABLED=0
13-
mod_timestamp: '{{ .CommitTimestamp }}'
14-
flags:
15-
- -trimpath
16-
ldflags:
17-
- '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
18-
goos:
19-
- freebsd
20-
- windows
21-
- linux
22-
- darwin
23-
goarch:
24-
- amd64
25-
- '386'
26-
- arm
27-
- arm64
28-
ignore:
29-
- goos: darwin
30-
goarch: '386'
31-
binary: '{{ .ProjectName }}_v{{ .Version }}'
11+
- env:
12+
# goreleaser does not work with CGO, it could also complicate
13+
# usage by users in CI/CD systems like Terraform Cloud where
14+
# they are unable to install libraries.
15+
- CGO_ENABLED=0
16+
mod_timestamp: "{{ .CommitTimestamp }}"
17+
flags:
18+
- -trimpath
19+
ldflags:
20+
- "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}"
21+
goos:
22+
- freebsd
23+
- windows
24+
- linux
25+
- darwin
26+
goarch:
27+
- amd64
28+
- "386"
29+
- arm
30+
- arm64
31+
ignore:
32+
- goos: darwin
33+
goarch: "386"
34+
binary: "{{ .ProjectName }}_v{{ .Version }}"
35+
3236
archives:
33-
- format: zip
34-
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
37+
- format: zip
38+
name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
39+
3540
checksum:
3641
extra_files:
37-
- glob: 'terraform-registry-manifest.json'
38-
name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
39-
name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
42+
- glob: "terraform-registry-manifest.json"
43+
name_template: "{{ .ProjectName }}_{{ .Version }}_manifest.json"
44+
name_template: "{{ .ProjectName }}_{{ .Version }}_SHA256SUMS"
4045
algorithm: sha256
46+
4147
signs:
4248
- artifacts: checksum
4349
args:
44-
# if you are using this in a GitHub action or some other automated pipeline, you
50+
# if you are using this in a GitHub action or some other automated pipeline, you
4551
# need to pass the batch flag to indicate its not interactive.
4652
- "--batch"
4753
- "--local-user"
@@ -50,11 +56,13 @@ signs:
5056
- "${signature}"
5157
- "--detach-sign"
5258
- "${artifact}"
59+
5360
release:
5461
extra_files:
55-
- glob: 'terraform-registry-manifest.json'
56-
name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
62+
- glob: "terraform-registry-manifest.json"
63+
name_template: "{{ .ProjectName }}_{{ .Version }}_manifest.json"
5764
# If you want to manually examine the release before its live, uncomment this line:
5865
# draft: true
66+
5967
changelog:
60-
skip: true
68+
disable: true

0 commit comments

Comments
 (0)