Skip to content

Commit c74efad

Browse files
removing merge detritus
Signed-off-by: Alex Lovell-Troy <alovelltroy@lanl.gov>
1 parent 1ee9f6e commit c74efad

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ Reusable GitHub Actions for CI/CD.
66

77
- `actions/gpg-ephemeral-key`: Ephemeral key generation for RPM/GPG signing
88
- `actions/sign-rpm`: RPM signing with ephemeral keys
9-
<<<<<<< HEAD
10-
- `workflows/go-build-release.yml`: Reusable workflow for GoReleaser builds
11-
=======
129
- `.github/workflows/go-build-release.yml`: Reusable workflow for GoReleaser builds
13-
>>>>>>> bb095e3 (reusable workflow for go build release using goreleaser)
1410

1511
## Versioning & Usage
1612

@@ -57,7 +53,6 @@ See the [workflow](workflows/go-build-release.yml) for additional input paramete
5753
=======
5854
**Documentation:** [docs/go-build-release.md](docs/go-build-release.md)
5955
**Examples:** [examples/](examples/)
60-
>>>>>>> bb095e3 (reusable workflow for go build release using goreleaser)
6156

6257
### gpg-ephemeral-key
6358
Generates a short‑lived RSA key (default 3072‑bit, 1 day) using an isolated `GNUPGHOME`, signs it with a repo‑scoped subkey you provide, and outputs:

0 commit comments

Comments
 (0)