[ISSUE-150] Fix tag collision: service-specific prefixes and unified cftunnels workflow #151

Dave · 2026-07-09T06:31:32Z

Dave commented

2026-07-09 06:31:32 +00:00

Summary

Implements Option A from issue #150.

Changes Made

New file: .gitea/workflows/cftunnels_build_push.yml
- Unified parameterized workflow replacing test_image_build_push.yml and prod_image_tag_promote.yaml
- Branch-based pattern matching portainer_automation_build_push.yml:
  - Push to test → PATCH bump → build & push :test image tag
  - Push to main → MINOR bump → promote :test → :prod
- Tags use cf- prefix (e.g., cf-0.x.y)
- Bare workflow_dispatch: (no inputs) for Gitea 1.22.x compat
- Portainer redeploy uses env-appropriate vars (dev vs prod)
Updated: .gitea/workflows/portainer_automation_build_push.yml
- Added pa- prefix to all git tags (e.g., pa-0.x.y)
- Uses --match "pa-*" in git describe to only find PA tags
- Strips prefix before semver parsing, re-adds on output
- Already has bare workflow_dispatch: (no inputs block per PR #149)
Deleted: .gitea/workflows/test_image_build_push.yml — absorbed into cftunnels_build_push.yml
Deleted: .gitea/workflows/prod_image_tag_promote.yaml — absorbed into cftunnels_build_push.yml

Tag Collision Fix

Service	Tag Pattern	Example
cftunnels-service	`cf-0.x.y`	`cf-0.29.0`
portainer-automation	`pa-0.x.y`	`pa-0.26.0`

Both services track independent semver sequences — no more collisions.

Issues

Hithomelabs/CFTunnels#150

## Summary Implements Option A from issue #150. ### Changes Made 1. **New file: `.gitea/workflows/cftunnels_build_push.yml`** - Unified parameterized workflow replacing `test_image_build_push.yml` and `prod_image_tag_promote.yaml` - Branch-based pattern matching `portainer_automation_build_push.yml`: - Push to `test` → PATCH bump → build & push `:test` image tag - Push to `main` → MINOR bump → promote `:test` → `:prod` - Tags use `cf-` prefix (e.g., `cf-0.x.y`) - Bare `workflow_dispatch:` (no inputs) for Gitea 1.22.x compat - Portainer redeploy uses env-appropriate vars (dev vs prod) 2. **Updated: `.gitea/workflows/portainer_automation_build_push.yml`** - Added `pa-` prefix to all git tags (e.g., `pa-0.x.y`) - Uses `--match "pa-*"` in `git describe` to only find PA tags - Strips prefix before semver parsing, re-adds on output - Already has bare `workflow_dispatch:` (no inputs block per PR #149) 3. **Deleted: `.gitea/workflows/test_image_build_push.yml`** — absorbed into `cftunnels_build_push.yml` 4. **Deleted: `.gitea/workflows/prod_image_tag_promote.yaml`** — absorbed into `cftunnels_build_push.yml` ### Tag Collision Fix | Service | Tag Pattern | Example | |---------|-------------|---------| | cftunnels-service | `cf-0.x.y` | `cf-0.29.0` | | portainer-automation | `pa-0.x.y` | `pa-0.26.0` | Both services track independent semver sequences — no more collisions. ## Issues - Hithomelabs/CFTunnels#150

Dave added 4 commits 2026-07-09 06:31:32 +00:00

Hithomelabs/CFTunnels#150 : Create unified cftunnels_build_push.yml with cf- prefix 9e35d730f4

Hithomelabs/CFTunnels#150 : Add pa- prefix to portainer-automation tags and remove inputs block 03c509c597

Hithomelabs/CFTunnels#150 : Delete test_image_build_push.yml (absorbed into cftunnels_build_push.yml) 2dc1ac17f1

Hithomelabs/CFTunnels#150 : Delete prod_image_tag_promote.yaml (absorbed into cftunnels_build_push.yml)

sample gradle build and test / build (pull_request) Successful in 1m50s

Details

d7a2af9928

Dave referenced this pull request

2026-07-09 06:31:38 +00:00

[ARCHITECTURE] Eliminate git tag collision between cftunnels-service and portainer-automation + parametrize cftunnels deployment #150

Dave added 1 commit 2026-07-09 06:45:07 +00:00

Hithomelabs/CFTunnels#150 : Resolve merge conflict in portainer_automation_build_push.yml (keep pa- prefix with ASCII arrows)

sample gradle build and test / build (pull_request) Successful in 1m49s

Details

Daily cloudflare API integration test / cloudflare-api-test (push) Successful in 1m46s

Details

Build & Push Portainer Automation / version (push) Successful in 7s

Details

Build & Push Portainer Automation / build-and-push (push) Successful in 29s

Details

Build & Push CFTunnels / version (push) Successful in 7s

Details

Build & Push CFTunnels / build-and-push (push) Successful in 30s

Details

f1c9965396

Dave commented

2026-07-09 06:45:13 +00:00

Merge conflicts resolved ✅

Conflict: .gitea/workflows/portainer_automation_build_push.yml — The upstream/test branch had a different character (✦ instead of →) in the invalid environment error message.

Resolution: Kept the PR branch version (arrow →) to stay consistent with the other message style changes in this PR.

PR is now mergeable. Ready for review/merge.

Merge conflicts resolved ✅ **Conflict**: `.gitea/workflows/portainer_automation_build_push.yml` — The `upstream/test` branch had a different character (`✦` instead of `→`) in the invalid environment error message. **Resolution**: Kept the PR branch version (arrow `→`) to stay consistent with the other message style changes in this PR. PR is now mergeable. Ready for review/merge.

hitanshu merged commit f1c9965396 into test

2026-07-09 06:50:57 +00:00

Polly referenced this pull request

2026-07-09 17:24:30 +00:00

[ARCHITECTURE] Eliminate git tag collision between cftunnels-service and portainer-automation + parametrize cftunnels deployment #150

Sign in to join this conversation.

No reviewers