Skip to content

Commit af0a738

Browse files
Benjosh95Benjosh95
committed
remove the apt testing stuff and isolation work again after successfully tested
1 parent d4a5a5e commit af0a738

File tree

4 files changed

+174
-196
lines changed

4 files changed

+174
-196
lines changed

‎.aptly.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"skipBz2Publishing": false,
2222
"FileSystemPublishEndpoints": {},
2323
"S3PublishEndpoints": {
24-
"distribution-test": {
24+
"distribution": {
2525
"region": "eu01",
26-
"bucket": "distribution-test",
26+
"bucket": "distribution",
2727
"acl":"public-read",
2828
"endpoint": "https://object.storage.eu01.onstackit.cloud"
2929
}

‎.github/workflows/release.yaml‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -83,51 +83,49 @@ jobs:
8383
run: |
8484
rm -f gpg-private-key.asc
8585
86-
# artifacts need to be passed to the "publish-apt" job somehow
86+
# artifacts need to be passed to further publishing jobs
8787
- name: Upload artifacts to workflow
8888
uses: actions/upload-artifact@v4
8989
with:
9090
name: goreleaser-dist-temp
9191
path: dist
9292
retention-days: 1
9393

94-
publish-apt:
95-
name: Publish APT
96-
runs-on: macOS-latest
97-
needs: [goreleaser]
98-
env:
99-
# Needed to publish new packages to our S3-hosted APT repo
100-
AWS_ACCESS_KEY_ID: ${{ secrets.TEST_OBJECT_STORAGE_ACCESS_KEY_ID }}
101-
AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_OBJECT_STORAGE_SECRET_ACCESS_KEY }}
102-
AWS_DEFAULT_REGION: eu01
103-
AWS_ENDPOINT_URL: https://object.storage.eu01.onstackit.cloud
104-
steps:
105-
- name: Checkout
106-
uses: actions/checkout@v5
94+
# publish-apt:
95+
# name: Publish APT
96+
# runs-on: macOS-latest
97+
# needs: [goreleaser]
98+
# env:
99+
# # Needed to publish new packages to our S3-hosted APT repo
100+
# AWS_ACCESS_KEY_ID: ${{ secrets.OBJECT_STORAGE_ACCESS_KEY_ID }}
101+
# AWS_SECRET_ACCESS_KEY: ${{ secrets.OBJECT_STORAGE_SECRET_ACCESS_KEY }}
102+
# steps:
103+
# - name: Checkout
104+
# uses: actions/checkout@v5
107105

108-
# use the artifacts from the "goreleaser" job
109-
- name: Download artifacts from workflow
110-
uses: actions/download-artifact@v5
111-
with:
112-
name: goreleaser-dist-temp
113-
path: dist
106+
# # use the artifacts from the "goreleaser" job
107+
# - name: Download artifacts from workflow
108+
# uses: actions/download-artifact@v5
109+
# with:
110+
# name: goreleaser-dist-temp
111+
# path: dist
114112

115-
- name: Install Aptly
116-
run: brew install aptly
113+
# - name: Install Aptly
114+
# run: brew install aptly
117115

118-
- name: Import GPG key
119-
uses: crazy-max/ghaction-import-gpg@v6
120-
id: import_gpg
121-
with:
122-
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
123-
passphrase: ${{ secrets.GPG_PASSPHRASE }}
116+
# - name: Import GPG key
117+
# uses: crazy-max/ghaction-import-gpg@v6
118+
# id: import_gpg
119+
# with:
120+
# gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
121+
# passphrase: ${{ secrets.GPG_PASSPHRASE }}
124122

125-
- name: Publish packages to APT repo
126-
# if: contains(github.ref_name, '-') == false
127-
env:
128-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
129-
GPG_PRIVATE_KEY_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
130-
run: ./scripts/publish-apt-packages.sh
123+
# - name: Publish packages to APT repo
124+
# if: contains(github.ref_name, '-') == false
125+
# env:
126+
# GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
127+
# GPG_PRIVATE_KEY_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
128+
# run: ./scripts/publish-apt-packages.sh
131129

132130
publish-rpm:
133131
name: Publish RPM

‎.goreleaser.yaml‎

Lines changed: 122 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -12,74 +12,74 @@ builds:
1212
- linux
1313
binary: "stackit"
1414

15-
# - id: windows-builds
16-
# env:
17-
# - CGO_ENABLED=0
18-
# goos:
19-
# - windows
20-
# binary: "stackit"
15+
- id: windows-builds
16+
env:
17+
- CGO_ENABLED=0
18+
goos:
19+
- windows
20+
binary: "stackit"
2121

22-
# - id: macos-builds
23-
# env:
24-
# - CGO_ENABLED=0
25-
# - BUNDLE_ID=cloud.stackit.cli
26-
# - "APPLE_APPLICATION_IDENTITY=Developer ID Application: Schwarz IT KG"
27-
# goos:
28-
# - darwin
29-
# binary: "stackit"
30-
# goarch:
31-
# - arm64
32-
# - amd64
33-
# hooks:
34-
# post:
35-
# # Signing
36-
# - cmd: codesign -s "{{.Env.APPLE_APPLICATION_IDENTITY}}" -f -v --options=runtime "dist/macos-builds_{{.Target}}/{{.Name}}"
37-
# output: true
38-
# - cmd: codesign -vvv --deep --strict "dist/macos-builds_{{.Target}}/{{.Name}}"
39-
# output: true
40-
# - cmd: hdiutil create -volname "STACKIT-CLI" -srcfolder "dist/macos-builds_{{.Target}}/{{.Name}}" -ov -format UDZO "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"
41-
# output: true
42-
# - cmd: codesign -s "{{.Env.APPLE_APPLICATION_IDENTITY}}" -f -v --options=runtime "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"
43-
# output: true
44-
# - cmd: xcrun notarytool submit --keychain-profile "stackit-cli" --wait --progress dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg
45-
# output: true
46-
# - cmd: xcrun stapler staple "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"
47-
# output: true
48-
# - cmd: spctl -a -t open --context context:primary-signature -v dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg
49-
# output: true
50-
# # Completion files
51-
# - cmd: mkdir -p dist/completions
52-
# - cmd: sh -c 'go run main.go completion zsh > ./dist/completions/stackit.zsh'
53-
# - cmd: sh -c 'go run main.go completion bash > ./dist/completions/stackit.bash'
54-
# - cmd: sh -c 'go run main.go completion fish > ./dist/completions/stackit.fish'
22+
- id: macos-builds
23+
env:
24+
- CGO_ENABLED=0
25+
- BUNDLE_ID=cloud.stackit.cli
26+
- "APPLE_APPLICATION_IDENTITY=Developer ID Application: Schwarz IT KG"
27+
goos:
28+
- darwin
29+
binary: "stackit"
30+
goarch:
31+
- arm64
32+
- amd64
33+
hooks:
34+
post:
35+
# Signing
36+
- cmd: codesign -s "{{.Env.APPLE_APPLICATION_IDENTITY}}" -f -v --options=runtime "dist/macos-builds_{{.Target}}/{{.Name}}"
37+
output: true
38+
- cmd: codesign -vvv --deep --strict "dist/macos-builds_{{.Target}}/{{.Name}}"
39+
output: true
40+
- cmd: hdiutil create -volname "STACKIT-CLI" -srcfolder "dist/macos-builds_{{.Target}}/{{.Name}}" -ov -format UDZO "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"
41+
output: true
42+
- cmd: codesign -s "{{.Env.APPLE_APPLICATION_IDENTITY}}" -f -v --options=runtime "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"
43+
output: true
44+
- cmd: xcrun notarytool submit --keychain-profile "stackit-cli" --wait --progress dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg
45+
output: true
46+
- cmd: xcrun stapler staple "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"
47+
output: true
48+
- cmd: spctl -a -t open --context context:primary-signature -v dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg
49+
output: true
50+
# Completion files
51+
- cmd: mkdir -p dist/completions
52+
- cmd: sh -c 'go run main.go completion zsh > ./dist/completions/stackit.zsh'
53+
- cmd: sh -c 'go run main.go completion bash > ./dist/completions/stackit.bash'
54+
- cmd: sh -c 'go run main.go completion fish > ./dist/completions/stackit.fish'
5555

56-
# archives:
57-
# - id: windows-archives
58-
# ids:
59-
# - windows-builds
60-
# formats: [ 'zip' ]
61-
# - ids:
62-
# - linux-builds
63-
# - macos-builds
64-
# formats: [ 'tar.gz' ]
65-
# files:
66-
# - src: ./dist/completions/*
67-
# dst: completions
68-
# - LICENSE.md
69-
# - README.md
56+
archives:
57+
- id: windows-archives
58+
ids:
59+
- windows-builds
60+
formats: [ 'zip' ]
61+
- ids:
62+
- linux-builds
63+
- macos-builds
64+
formats: [ 'tar.gz' ]
65+
files:
66+
- src: ./dist/completions/*
67+
dst: completions
68+
- LICENSE.md
69+
- README.md
7070

71-
# release:
72-
# # If set to auto, the GitHub release will be marked as "Pre-release"
73-
# # if the tag has a prerelease indicator (e.g. v0.0.1-alpha1)
74-
# prerelease: auto
71+
release:
72+
# If set to auto, the GitHub release will be marked as "Pre-release"
73+
# if the tag has a prerelease indicator (e.g. v0.0.1-alpha1)
74+
prerelease: auto
7575

76-
# changelog:
77-
# use: github
78-
# sort: asc
79-
# filters:
80-
# exclude:
81-
# - "^docs:"
82-
# - "^test:"
76+
changelog:
77+
use: github
78+
sort: asc
79+
filters:
80+
exclude:
81+
- "^docs:"
82+
- "^test:"
8383

8484
nfpms:
8585
- id: linux-packages
@@ -109,75 +109,63 @@ nfpms:
109109
# Templates: allowed.
110110
key_file: "{{ .Env.GPG_KEY_PATH }}"
111111

112-
# signs:
113-
# - artifacts: package
114-
# args:
115-
# [
116-
# "-u",
117-
# "{{ .Env.GPG_FINGERPRINT }}",
118-
# "--output",
119-
# "${signature}",
120-
# "--detach-sign",
121-
# "${artifact}",
122-
# ]
123-
124-
# homebrew_casks:
125-
# - name: stackit
126-
# directory: Casks
127-
# repository:
128-
# owner: stackitcloud
129-
# name: homebrew-tap
130-
# commit_author:
131-
# name: CLI Release Bot
132-
# email: [email protected]
133-
# homepage: "https://github.com/stackitcloud/stackit-cli"
134-
# description: "A command-line interface to manage STACKIT resources."
135-
# license: "Apache-2.0"
136-
# # If set to auto, the release will not be uploaded to the homebrew tap repo
137-
# # if the tag has a prerelease indicator (e.g. v0.0.1-alpha1)
138-
# skip_upload: auto
139-
# completions:
140-
# zsh: ./completions/stackit.zsh
141-
# bash: ./completions/stackit.bash
142-
# fish: ./completions/stackit.fish
112+
homebrew_casks:
113+
- name: stackit
114+
directory: Casks
115+
repository:
116+
owner: stackitcloud
117+
name: homebrew-tap
118+
commit_author:
119+
name: CLI Release Bot
120+
email: [email protected]
121+
homepage: "https://github.com/stackitcloud/stackit-cli"
122+
description: "A command-line interface to manage STACKIT resources."
123+
license: "Apache-2.0"
124+
# If set to auto, the release will not be uploaded to the homebrew tap repo
125+
# if the tag has a prerelease indicator (e.g. v0.0.1-alpha1)
126+
skip_upload: auto
127+
completions:
128+
zsh: ./completions/stackit.zsh
129+
bash: ./completions/stackit.bash
130+
fish: ./completions/stackit.fish
143131

144-
# snapcrafts:
145-
# # IDs of the builds for which to create packages for
146-
# - ids:
147-
# - linux-builds
148-
# # The name of the snap
149-
# name: stackit
150-
# # The canonical title of the application, displayed in the software
151-
# # centre graphical frontends
152-
# title: STACKIT CLI
153-
# summary: A command-line interface to manage STACKIT resources.
154-
# description: "A command-line interface to manage STACKIT resources."
155-
# license: Apache-2.0
156-
# confinement: classic
157-
# # Grade "devel" will only release to `edge` and `beta` channels
158-
# # Grade "stable" will also release to the `candidate` and `stable` channels
159-
# grade: stable
160-
# # Whether to publish the Snap to the store
161-
# publish: true
132+
snapcrafts:
133+
# IDs of the builds for which to create packages for
134+
- ids:
135+
- linux-builds
136+
# The name of the snap
137+
name: stackit
138+
# The canonical title of the application, displayed in the software
139+
# centre graphical frontends
140+
title: STACKIT CLI
141+
summary: A command-line interface to manage STACKIT resources.
142+
description: "A command-line interface to manage STACKIT resources."
143+
license: Apache-2.0
144+
confinement: classic
145+
# Grade "devel" will only release to `edge` and `beta` channels
146+
# Grade "stable" will also release to the `candidate` and `stable` channels
147+
grade: stable
148+
# Whether to publish the Snap to the store
149+
publish: true
162150

163-
# winget:
164-
# - name: stackit
165-
# publisher: stackitcloud
166-
# short_description: A command-line interface to manage STACKIT resources.
167-
# license: Apache-2.0
168-
# publisher_support_url: "https://github.com/stackitcloud/stackit-cli/issues"
169-
# package_identifier: stackitcloud.stackit
170-
# homepage: "https://github.com/stackitcloud/stackit-cli"
171-
# # If set to auto, the release will not be uploaded to the homebrew tap repo
172-
# # if the tag has a prerelease indicator (e.g. v0.0.1-alpha1)
173-
# # Temporarily not skipping prereleases to test integration with Winget
174-
# # skip_upload: auto
175-
# repository:
176-
# owner: stackitcloud
177-
# name: winget-pkgs
178-
# pull_request:
179-
# enabled: true
180-
# base:
181-
# owner: microsoft
182-
# name: winget-pkgs
183-
# branch: master
151+
winget:
152+
- name: stackit
153+
publisher: stackitcloud
154+
short_description: A command-line interface to manage STACKIT resources.
155+
license: Apache-2.0
156+
publisher_support_url: "https://github.com/stackitcloud/stackit-cli/issues"
157+
package_identifier: stackitcloud.stackit
158+
homepage: "https://github.com/stackitcloud/stackit-cli"
159+
# If set to auto, the release will not be uploaded to the homebrew tap repo
160+
# if the tag has a prerelease indicator (e.g. v0.0.1-alpha1)
161+
# Temporarily not skipping prereleases to test integration with Winget
162+
# skip_upload: auto
163+
repository:
164+
owner: stackitcloud
165+
name: winget-pkgs
166+
pull_request:
167+
enabled: true
168+
base:
169+
owner: microsoft
170+
name: winget-pkgs
171+
branch: master

0 commit comments

Comments
 (0)