Skip to content

Commit f914a70

Browse files
fiftinfiftin
authored
feat: add repos for community and standard versions (#3376)
* feat: add repos for commuity and standard versions * ci: update goreleaser * ci: fix goreleaser installation * ci: fix go releaser install (2) * ci: goreleaser v2.11.2 * ci: fix goreleaser vars * ci: use_existing_draft * ci: cache for docker image * ci: fix checksum filename * ci: a bit change package name
1 parent 10ec123 commit f914a70

File tree

6 files changed

+72
-24
lines changed

6 files changed

+72
-24
lines changed

‎.github/workflows/beta.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Run release
5151
run: |
5252
GITHUB_TOKEN=${{ secrets.GH_TOKEN }} \
53-
PROJECT_NAME=semaphore \
53+
PROJECT_NAME=semaphore-community \
5454
GPG_KEY_ID="${{ vars.GPG_KEY_ID }}" \
5555
task release:prod
5656
@@ -83,7 +83,7 @@ jobs:
8383
with:
8484
github-token: ${{ secrets.GITHUB_TOKEN }}
8585
images: |
86-
semaphoreui/semaphore
86+
semaphoreui/semaphore-community
8787
labels: |
8888
org.opencontainers.image.vendor=SemaphoreUI
8989
maintainer=Semaphore UI <[email protected]>
@@ -110,7 +110,7 @@ jobs:
110110
with:
111111
github-token: ${{ secrets.GITHUB_TOKEN }}
112112
images: |
113-
semaphoreui/runner
113+
semaphoreui/runner-community
114114
labels: |
115115
org.opencontainers.image.vendor=SemaphoreUI
116116
maintainer=Semaphore UI <[email protected]>

‎.github/workflows/dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ jobs:
657657
with:
658658
github-token: ${{ secrets.GITHUB_TOKEN }}
659659
images: |
660-
semaphoreui/semaphore
660+
semaphoreui/semaphore-community
661661
labels: |
662662
org.opencontainers.image.vendor=SemaphoreUI
663663
maintainer=Semaphore UI <[email protected]>
@@ -712,7 +712,7 @@ jobs:
712712
with:
713713
github-token: ${{ secrets.GITHUB_TOKEN }}
714714
images: |
715-
semaphoreui/runner
715+
semaphoreui/runner-community
716716
labels: |
717717
org.opencontainers.image.vendor=SemaphoreUI
718718
maintainer=Semaphore UI <[email protected]>

‎.github/workflows/pro_selfhosted_release.yml‎

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
APP_BUILD_TYPE=pro_selfhosted \
6060
GITHUB_TOKEN=${{ secrets.GH_TOKEN }} \
6161
GPG_KEY_ID="${{ vars.GPG_KEY_ID }}" \
62-
PROJECT_NAME=semaphorepro \
62+
PROJECT_NAME=semaphore \
6363
task release:prod
6464
6565
deploy-prod:
@@ -88,6 +88,13 @@ jobs:
8888
env:
8989
AWS_REGION: us-east-1
9090

91+
- name: Docker Hub login
92+
uses: docker/login-action@v3
93+
if: github.event_name != 'pull_request'
94+
with:
95+
username: ${{ secrets.DOCKER_USER }}
96+
password: ${{ secrets.DOCKER_PASS }}
97+
9198

9299

93100
- name: Server meta
@@ -97,6 +104,8 @@ jobs:
97104
github-token: ${{ secrets.GITHUB_TOKEN }}
98105
images: |
99106
public.ecr.aws/semaphore/pro/server
107+
public.ecr.aws/semaphore/server
108+
semaphoreui/semaphore
100109
labels: |
101110
org.opencontainers.image.vendor=SemaphoreUI
102111
maintainer=Semaphore UI <[email protected]>
@@ -118,6 +127,9 @@ jobs:
118127
push: ${{ github.event_name != 'pull_request' }}
119128
labels: ${{ steps.server.outputs.labels }}
120129
tags: ${{ steps.server.outputs.tags }}
130+
cache-from: type=gha
131+
cache-to: type=gha,mode=max
132+
provenance: false
121133

122134
- name: Server build with Ansible 2.16.5
123135
uses: docker/build-push-action@v5
@@ -132,7 +144,13 @@ jobs:
132144
platforms: linux/amd64,linux/arm64 # ,linux/arm/v6
133145
push: ${{ github.event_name != 'pull_request' }}
134146
labels: ${{ steps.server.outputs.labels }}
135-
tags: public.ecr.aws/semaphore/pro/server:${{ github.ref_name }}-ansible2.16.5
147+
tags: |
148+
public.ecr.aws/semaphore/pro/server:${{ github.ref_name }}-ansible2.16.5
149+
public.ecr.aws/semaphore/server:${{ github.ref_name }}-ansible2.16.5
150+
semaphoreui/semaphore:${{ github.ref_name }}-ansible2.16.5
151+
cache-from: type=gha
152+
cache-to: type=gha,mode=max
153+
provenance: false
136154

137155
- name: Server build with PowerShell 7.5.0
138156
uses: docker/build-push-action@v5
@@ -141,15 +159,21 @@ jobs:
141159
context: .
142160
build-args: |
143161
POWERSHELL_VERSION=7.5.0
144-
SEMAPHORE_IMAGE=public.ecr.aws/semaphore/pro/server
162+
SEMAPHORE_IMAGE=public.ecr.aws/semaphore/server
145163
SEMAPHORE_VERSION=${{ github.ref_name }}
146164
GH_TOKEN=${{ secrets.GH_TOKEN }}
147165
APP_BUILD_TYPE=pro_selfhosted
148166
file: deployment/docker/server/powershell/Dockerfile
149167
platforms: linux/amd64
150168
push: ${{ github.event_name != 'pull_request' }}
151169
labels: ${{ steps.server.outputs.labels }}
152-
tags: public.ecr.aws/semaphore/pro/server:${{ github.ref_name }}-powershell7.5.0
170+
tags: |
171+
public.ecr.aws/semaphore/pro/server:${{ github.ref_name }}-powershell7.5.0
172+
public.ecr.aws/semaphore/server:${{ github.ref_name }}-powershell7.5.0
173+
semaphoreui/semaphore:${{ github.ref_name }}-powershell7.5.0
174+
cache-from: type=gha
175+
cache-to: type=gha,mode=max
176+
provenance: false
153177

154178

155179

@@ -160,6 +184,8 @@ jobs:
160184
github-token: ${{ secrets.GITHUB_TOKEN }}
161185
images: |
162186
public.ecr.aws/semaphore/pro/runner
187+
public.ecr.aws/semaphore/runner
188+
semaphoreui/runner
163189
labels: |
164190
org.opencontainers.image.vendor=SemaphoreUI
165191
maintainer=Semaphore UI <[email protected]>
@@ -180,6 +206,9 @@ jobs:
180206
push: ${{ github.event_name != 'pull_request' }}
181207
labels: ${{ steps.runner.outputs.labels }}
182208
tags: ${{ steps.runner.outputs.tags }}
209+
cache-from: type=gha
210+
cache-to: type=gha,mode=max
211+
provenance: false
183212

184213
- name: Runner build with Ansible 2.16.5
185214
uses: docker/build-push-action@v5
@@ -193,7 +222,13 @@ jobs:
193222
platforms: linux/amd64,linux/arm64 #,linux/arm/v6
194223
push: ${{ github.event_name != 'pull_request' }}
195224
labels: ${{ steps.runner.outputs.labels }}
196-
tags: public.ecr.aws/semaphore/pro/runner:${{ github.ref_name }}-ansible2.16.5
225+
tags: |
226+
public.ecr.aws/semaphore/pro/runner:${{ github.ref_name }}-ansible2.16.5
227+
public.ecr.aws/semaphore/runner:${{ github.ref_name }}-ansible2.16.5
228+
semaphoreui/runner:${{ github.ref_name }}-ansible2.16.5
229+
cache-from: type=gha
230+
cache-to: type=gha,mode=max
231+
provenance: false
197232

198233
- name: Runner build with PowerShell 7.5.0
199234
uses: docker/build-push-action@v5
@@ -202,11 +237,17 @@ jobs:
202237
context: .
203238
build-args: |
204239
POWERSHELL_VERSION=7.5.0
205-
SEMAPHORE_IMAGE=public.ecr.aws/semaphore/pro/runner
240+
SEMAPHORE_IMAGE=public.ecr.aws/semaphore/runner
206241
SEMAPHORE_VERSION=${{ github.ref_name }}
207242
GH_TOKEN=${{ secrets.GH_TOKEN }}
208243
file: deployment/docker/server/powershell/Dockerfile
209244
platforms: linux/amd64
210245
push: ${{ github.event_name != 'pull_request' }}
211246
labels: ${{ steps.runner.outputs.labels }}
212-
tags: public.ecr.aws/semaphore/pro/runner:${{ github.ref_name }}-powershell7.5.0
247+
tags: |
248+
public.ecr.aws/semaphore/pro/runner:${{ github.ref_name }}-powershell7.5.0
249+
public.ecr.aws/semaphore/runner:${{ github.ref_name }}-powershell7.5.0
250+
semaphoreui/runner:${{ github.ref_name }}-powershell7.5.0
251+
cache-from: type=gha
252+
cache-to: type=gha,mode=max
253+
provenance: false

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: |
5353
GITHUB_TOKEN=${{ secrets.GH_TOKEN }} \
5454
GPG_KEY_ID="${{ vars.GPG_KEY_ID }}" \
55-
PROJECT_NAME=semaphore \
55+
PROJECT_NAME=semaphore-community \
5656
task release:prod
5757
5858
deploy-prod:
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
github-token: ${{ secrets.GITHUB_TOKEN }}
8888
images: |
89-
semaphoreui/semaphore
89+
semaphoreui/semaphore-community
9090
labels: |
9191
org.opencontainers.image.vendor=SemaphoreUI
9292
maintainer=Semaphore UI <[email protected]>
@@ -117,7 +117,7 @@ jobs:
117117
platforms: linux/amd64,linux/arm64 # ,linux/arm/v6
118118
push: ${{ github.event_name != 'pull_request' }}
119119
labels: ${{ steps.server.outputs.labels }}
120-
tags: semaphoreui/semaphore:${{ github.ref_name }}-ansible2.16.5
120+
tags: semaphoreui/semaphore-community:${{ github.ref_name }}-ansible2.16.5
121121

122122
- name: Server build with PowerShell 7.5.0
123123
uses: docker/build-push-action@v5
@@ -126,13 +126,13 @@ jobs:
126126
context: .
127127
build-args: |
128128
POWERSHELL_VERSION=7.5.0
129-
SEMAPHORE_IMAGE=semaphoreui/semaphore
129+
SEMAPHORE_IMAGE=semaphoreui/semaphore-community
130130
SEMAPHORE_VERSION=${{ github.ref_name }}
131131
file: deployment/docker/server/powershell/Dockerfile
132132
platforms: linux/amd64
133133
push: ${{ github.event_name != 'pull_request' }}
134134
labels: ${{ steps.server.outputs.labels }}
135-
tags: semaphoreui/semaphore:${{ github.ref_name }}-powershell7.5.0
135+
tags: semaphoreui/semaphore-community:${{ github.ref_name }}-powershell7.5.0
136136

137137

138138

@@ -142,7 +142,7 @@ jobs:
142142
with:
143143
github-token: ${{ secrets.GITHUB_TOKEN }}
144144
images: |
145-
semaphoreui/runner
145+
semaphoreui/runner-community
146146
labels: |
147147
org.opencontainers.image.vendor=SemaphoreUI
148148
maintainer=Semaphore UI <[email protected]>
@@ -173,7 +173,7 @@ jobs:
173173
platforms: linux/amd64,linux/arm64 #,linux/arm/v6
174174
push: ${{ github.event_name != 'pull_request' }}
175175
labels: ${{ steps.runner.outputs.labels }}
176-
tags: semaphoreui/runner:${{ github.ref_name }}-ansible2.16.5
176+
tags: semaphoreui/runner-community:${{ github.ref_name }}-ansible2.16.5
177177

178178
- name: Runner build with PowerShell 7.5.0
179179
uses: docker/build-push-action@v5
@@ -182,10 +182,10 @@ jobs:
182182
context: .
183183
build-args: |
184184
POWERSHELL_VERSION=7.5.0
185-
SEMAPHORE_IMAGE=semaphoreui/runner
185+
SEMAPHORE_IMAGE=semaphoreui/runner-community
186186
SEMAPHORE_VERSION=${{ github.ref_name }}
187187
file: deployment/docker/server/powershell/Dockerfile
188188
platforms: linux/amd64
189189
push: ${{ github.event_name != 'pull_request' }}
190190
labels: ${{ steps.runner.outputs.labels }}
191-
tags: semaphoreui/runner:${{ github.ref_name }}-powershell7.5.0
191+
tags: semaphoreui/runner-community:${{ github.ref_name }}-powershell7.5.0

‎.goreleaser.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: 2
12
dist: bin
23

34
before:
@@ -52,6 +53,8 @@ archives:
5253
signs:
5354
-
5455
artifacts: checksum
56+
signature: "{{ .Env.PROJECT_NAME }}_{{ .Version }}_checksums.txt.sig"
57+
cmd: gpg
5558
args: [
5659
"-u", "{{ .Env.GPG_KEY_ID }}",
5760
"--pinentry-mode", "loopback",
@@ -61,12 +64,15 @@ signs:
6164
"--detach-sign", "${artifact}"
6265
]
6366

67+
checksum:
68+
name_template: "{{ .Env.PROJECT_NAME }}_{{ .Version }}_checksums.txt"
69+
6470
snapshot:
6571
name_template: "{{ .Timestamp }}-{{ .ShortCommit }}-SNAPSHOT"
6672

6773
nfpms:
6874
- file_name_template: "{{ .Env.PROJECT_NAME }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
69-
package_name: "{{ .Env.PROJECT_NAME }}"
75+
package_name: "semaphore"
7076
description: Modern UI and powerful API for Ansible, Terraform, OpenTofu, PowerShell and other DevOps tools.
7177
homepage: https://github.com/semaphoreui/semaphore
7278
vendor: Semaphore UI
@@ -87,4 +93,5 @@ nfpms:
8793

8894
release:
8995
draft: true
96+
use_existing_draft: true
9097
name_template: "{{.Tag}}"

‎Taskfile.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ tasks:
2929
desc: Installs required tools to build and publish
3030
vars:
3131
SWAGGER_VERSION: v0.30.5
32-
GORELEASER_VERSION: v1.25.1
32+
GORELEASER_VERSION: v2.11.2
3333
GOLINTER_VERSION: v1.57.2
3434
cmds:
3535
# - go install github.com/go-swagger/go-swagger/cmd/swagger@{{ .SWAGGER_VERSION }}
36-
- go install github.com/goreleaser/goreleaser@{{ .GORELEASER_VERSION }}
36+
- go install github.com/goreleaser/goreleaser/v2@{{ .GORELEASER_VERSION }}
3737
# - go install github.com/golangci/golangci-lint/cmd/golangci-lint@{{ .GOLINTER_VERSION }}
3838
dir: /tmp
3939

0 commit comments

Comments
 (0)