Skip to content

Commit eeed803

Browse files
authored
Merge branch 'main' into kms-beta
2 parents 6459764 + dc56c93 commit eeed803

File tree

7 files changed

+14
-59
lines changed

7 files changed

+14
-59
lines changed

.aptly.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"region": "eu01",
2626
"bucket": "distribution",
2727
"acl":"public-read",
28-
"endpoint": "object.storage.eu01.onstackit.cloud"
28+
"endpoint": "https://object.storage.eu01.onstackit.cloud"
2929
}
3030
},
3131
"SwiftPublishEndpoints": {},

.github/workflows/release.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,8 @@ jobs:
6161
APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
6262
SIGNING_CERTIFICATE_BASE64: ${{ secrets.APPLICATION_ID_CERT }}
6363
AUTHKEY_BASE64: ${{ secrets.APPLE_API_KEY }}
64-
# aptly version 1.6.0 results in an segmentation fault. Therefore we fall back to version 1.5.0.
65-
# Since it is not possible to specify a version via brew command a formula was added for aptly 1.5.0
66-
# (source: https://github.com/Homebrew/homebrew-core/pull/202415/files)
67-
- name: Install Aptly version 1.5.0
68-
run: brew install aptly.rb
64+
- name: Install Aptly
65+
run: brew install aptly
6966
- name: Install Snapcraft
7067
uses: samuelmeuli/action-snapcraft@v3
7168
- name: Run GoReleaser

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v5
1515
- name: Self-hosted Renovate
16-
uses: renovatebot/github-action@v43.0.9
16+
uses: renovatebot/github-action@v43.0.10
1717
with:
1818
configurationFile: .github/renovate.json
1919
token: ${{ secrets.RENOVATE_TOKEN }}

.goreleaser.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ signs:
117117
homebrew_casks:
118118
- name: stackit
119119
directory: Casks
120-
conflicts:
121-
- formula: stackit
122120
repository:
123121
owner: stackitcloud
124122
name: homebrew-tap

aptly.rb

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

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ require (
1212
github.com/jedib0t/go-pretty/v6 v6.6.8
1313
github.com/lmittmann/tint v1.1.2
1414
github.com/mattn/go-colorable v0.1.14
15-
github.com/spf13/cobra v1.9.1
16-
github.com/spf13/pflag v1.0.7
15+
github.com/spf13/cobra v1.10.1
16+
github.com/spf13/pflag v1.0.10
1717
github.com/spf13/viper v1.20.1
1818
github.com/stackitcloud/stackit-sdk-go/core v0.17.3
1919
github.com/stackitcloud/stackit-sdk-go/services/alb v0.6.1
@@ -243,7 +243,7 @@ require (
243243
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.1
244244
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.1
245245
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.1
246-
github.com/stackitcloud/stackit-sdk-go/services/observability v0.11.1
246+
github.com/stackitcloud/stackit-sdk-go/services/observability v0.12.0
247247
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.25.1
248248
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.1
249249
github.com/subosito/gotenv v1.6.0 // indirect

go.sum

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -553,12 +553,12 @@ github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
553553
github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
554554
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
555555
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
556-
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
557-
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
556+
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
557+
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
558558
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
559-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
560-
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
561-
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
559+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
560+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
561+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
562562
github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
563563
github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
564564
github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0=
@@ -587,8 +587,8 @@ github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.2 h1:BQ+qAkVS/a
587587
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.2/go.mod h1:oc8Mpwl7O6EZwG0YxfhOzNCJwNQBWK5rFh764OtxoMY=
588588
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.1 h1:4jsFLbDVEosYTgQz6lPds1E9KDOiHwjuhWqcG+lo5B4=
589589
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.3.1/go.mod h1:j1SHAS5lN8F9b/iPUOfjAl9QAA9tOT7NKOiDEzcM2zc=
590-
github.com/stackitcloud/stackit-sdk-go/services/observability v0.11.1 h1:y4CfGRNRGdAV3i6+ATIHsr+n6+As5kL9GBXO7FK6gy8=
591-
github.com/stackitcloud/stackit-sdk-go/services/observability v0.11.1/go.mod h1:tJEOi6L0le4yQZPGwalup/PZ13gqs1aCQDqlUs2cYW0=
590+
github.com/stackitcloud/stackit-sdk-go/services/observability v0.12.0 h1:myi6k4LQJJGaMGwzBKp5hlatrCNNf8FR+/gqnzxnGb8=
591+
github.com/stackitcloud/stackit-sdk-go/services/observability v0.12.0/go.mod h1:tJEOi6L0le4yQZPGwalup/PZ13gqs1aCQDqlUs2cYW0=
592592
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.1 h1:50n87uZn0EvSP9hJGLqd3Wm2hfqbyh7BMGGCk7axgqA=
593593
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.1/go.mod h1:jfguuSPa56Z5Bzs/Xg/CI37XzPo5Zn5lzC5LhfuT8Qc=
594594
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.1 h1:K8vXele3U6b5urcSIpq21EkVblWfPDY3eMPSuQ48TkI=

0 commit comments

Comments
 (0)