Skip to content

Commit 426a0c9

Browse files
committed
Revert "chore(release): unify sdlc flow and cli publish"
This reverts commit 7616cae.
1 parent 7616cae commit 426a0c9

9 files changed

Lines changed: 16 additions & 132 deletions

File tree

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Questions & Discussions
4-
url: https://github.com/go-modkit/modkit/discussions
4+
url: https://github.com/aryeko/modkit/discussions
55
about: Ask questions and discuss ideas (don't open an issue)
66
- name: Security Vulnerabilities
7-
url: https://github.com/go-modkit/modkit/security/policy
7+
url: https://github.com/aryeko/modkit/security/policy
88
about: Report security issues privately

.github/pull_request_template.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,15 @@
2626

2727
<!-- Commands run and their results -->
2828
```bash
29-
make fmt && make lint && make vuln && make test && make test-coverage
30-
make cli-smoke-build && make cli-smoke-scaffold
29+
make fmt && make lint && make test
3130
```
3231

3332
## Checklist
3433

3534
<!-- All boxes should be checked before requesting review -->
3635
- [ ] Code follows project style (`make fmt` passes)
3736
- [ ] Linter passes (`make lint`)
38-
- [ ] Vulnerability scan passes (`make vuln`)
3937
- [ ] Tests pass (`make test`)
40-
- [ ] Coverage tests pass (`make test-coverage`)
41-
- [ ] CLI smoke checks pass (`make cli-smoke-build && make cli-smoke-scaffold`)
4238
- [ ] Tests added/updated for new functionality
4339
- [ ] Documentation updated (if applicable)
4440
- [ ] Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/)

.github/workflows/ci.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ on:
66
- main
77
pull_request:
88

9-
permissions:
10-
contents: read
11-
12-
concurrency:
13-
group: ci-${{ github.workflow }}-${{ github.ref }}
14-
cancel-in-progress: true
15-
169
jobs:
1710
pr-title:
1811
name: Validate PR Title
@@ -71,7 +64,6 @@ jobs:
7164
- name: Test with coverage
7265
run: make test-coverage
7366
- name: Upload coverage to Codecov
74-
if: ${{ secrets.CODECOV_TOKEN != '' }}
7567
uses: codecov/codecov-action@v5
7668
with:
7769
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ on:
55
branches:
66
- main
77

8-
concurrency:
9-
group: release-${{ github.ref }}
10-
cancel-in-progress: false
11-
128
permissions:
139
contents: write
1410

@@ -28,28 +24,6 @@ jobs:
2824
allow-initial-development-versions: true
2925
changelog-generator-opt: "emojis=true"
3026

31-
- name: Set up Go
32-
if: steps.semrel.outputs.version != ''
33-
uses: actions/setup-go@v6
34-
with:
35-
go-version: "1.25.7"
36-
cache-dependency-path: |
37-
tools/tools.go
38-
go.mod
39-
40-
- name: Refresh tags
41-
if: steps.semrel.outputs.version != ''
42-
run: git fetch --force --tags
43-
44-
- name: Publish CLI release artifacts
45-
if: steps.semrel.outputs.version != ''
46-
uses: goreleaser/goreleaser-action@v6
47-
with:
48-
version: "~> v2"
49-
args: release --clean
50-
env:
51-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52-
5327
- name: Release info
5428
if: steps.semrel.outputs.version != ''
5529
run: |

.goreleaser.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,15 @@ make cli-smoke-scaffold
108108
### Install Development Tools
109109

110110
```bash
111-
make tools
112-
```
111+
# goimports (for make fmt)
112+
go install golang.org/x/tools/cmd/goimports@latest
113+
114+
# golangci-lint (for make lint)
115+
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
113116

114-
`make tools` installs tool versions pinned by the repository.
117+
# govulncheck (for make vuln)
118+
go install golang.org/x/vuln/cmd/govulncheck@latest
119+
```
115120

116121
## Contribution Guidelines
117122

@@ -126,8 +131,7 @@ make tools
126131
1. Fork the repository
127132
2. Create a feature branch (`git checkout -b feat/my-feature`)
128133
3. Make your changes with tests
129-
4. Run `make fmt && make lint && make vuln && make test && make test-coverage`
130-
- Also run CLI gate: `make cli-smoke-build && make cli-smoke-scaffold`
134+
4. Run `make fmt && make lint && make test`
131135
5. Commit with a conventional prefix (`feat:`, `fix:`, `docs:`, `chore:`)
132136
6. Open a pull request with a clear description
133137

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ See [Architecture Guide](docs/architecture.md) for details.
224224
- [API Reference](docs/reference/api.md) — Types and functions
225225
- [Architecture](docs/architecture.md) — How modkit works under the hood
226226
- [FAQ](docs/faq.md) — Common questions
227-
- [Release Process](docs/guides/release-process.md) — CI and versioned CLI release flow
228227

229228
**Examples:**
230229
- [hello-simple](examples/hello-simple/) — Minimal example, no Docker

docs/guides/release-process.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

docs/specs/design-release-versioning-sdlc-cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ Current release flow creates semantic versions and release notes, but it does no
5656

5757
## 6. Required CI Changes
5858

59-
## 6.1. Maintain CLI Smoke-Test Job in `ci.yml`
59+
## 6.1. Add CLI Smoke-Test Job in `ci.yml`
6060

61-
`cli-smoke` is already present in `ci.yml` and must remain a required check on pull requests and pushes.
61+
Add a new job `cli-smoke` that runs on pull requests and pushes.
6262

6363
Validation sequence:
6464

@@ -180,7 +180,7 @@ This initiative is complete when all are true:
180180

181181
### Phase 1: CI Guardrails
182182

183-
- Confirm `cli-smoke` job remains enforced in `ci.yml`.
183+
- Add `cli-smoke` job to `ci.yml`.
184184
- Validate against current `main`.
185185

186186
### Phase 2: Release Artifacts
@@ -207,7 +207,7 @@ This initiative is complete when all are true:
207207

208208
The follow-up PR (after `feat/cli-tooling` merge) should include:
209209

210-
- [ ] `cli-smoke` job in `.github/workflows/ci.yml` is preserved and remains required.
210+
- [ ] `.github/workflows/ci.yml` updated with `cli-smoke` job.
211211
- [ ] `.github/workflows/release.yml` updated for CLI artifact publishing.
212212
- [ ] `.goreleaser.yml` added and validated.
213213
- [ ] README install section updated.

0 commit comments

Comments
 (0)