Skip to content

Commit 026b615

Browse files
authored
Merge branch 'main' into feat/onboard-iaas-snapshot-api
2 parents 8d98c69 + f2b13ce commit 026b615

File tree

6 files changed

+45
-14
lines changed

6 files changed

+45
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
name: CI
22

3-
on: [pull_request, workflow_dispatch]
3+
on:
4+
pull_request:
5+
workflow_dispatch:
6+
push:
7+
branches:
8+
- main
9+
10+
env:
11+
CODE_COVERAGE_FILE_NAME: "coverage.out" # must be the same as in Makefile
12+
CODE_COVERAGE_ARTIFACT_NAME: "code-coverage"
413

514
jobs:
615
main:
@@ -26,8 +35,15 @@ jobs:
2635
- name: Test
2736
run: make test
2837

38+
- name: Archive code coverage results
39+
uses: actions/upload-artifact@v4
40+
with:
41+
name: ${{ env.CODE_COVERAGE_ARTIFACT_NAME }}
42+
path: ${{ env.CODE_COVERAGE_FILE_NAME }}
43+
2944
config:
3045
name: Check GoReleaser config
46+
if: github.event_name == 'pull_request'
3147
runs-on: ubuntu-latest
3248
steps:
3349
- name: Checkout
@@ -36,4 +52,19 @@ jobs:
3652
- name: Check GoReleaser
3753
uses: goreleaser/goreleaser-action@v6
3854
with:
39-
args: check
55+
args: check
56+
57+
code_coverage:
58+
name: "Code coverage report"
59+
if: github.event_name == 'pull_request' # Do not run when workflow is triggered by push to main branch
60+
runs-on: ubuntu-latest
61+
needs: main
62+
permissions:
63+
contents: read
64+
actions: read # to download code coverage results from "main" job
65+
pull-requests: write # write permission needed to comment on PR
66+
steps:
67+
- uses: fgrosse/[email protected]
68+
with:
69+
coverage-artifact-name: ${{ env.CODE_COVERAGE_ARTIFACT_NAME }}
70+
coverage-file-name: ${{ env.CODE_COVERAGE_FILE_NAME }}

.github/workflows/release.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
security create-keychain -p "${{ secrets.TEMP_KEYCHAIN }}" $KEYCHAIN_PATH
4949
security default-keychain -s $KEYCHAIN_PATH
5050
security unlock-keychain -p "${{ secrets.TEMP_KEYCHAIN }}" $KEYCHAIN_PATH
51+
# the keychain gets locked automatically after 300s, so we have to extend this interval to e.g. 900 seconds
52+
security set-keychain-settings -lut 900
5153
security import ./ApplicationID.p12 -P "${{ secrets.APPLICATION_ID }}" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
5254
security list-keychain -d user -s $KEYCHAIN_PATH
5355
echo -n $AUTHKEY_BASE64 | base64 -d -o ./AuthKey.p8

.goreleaser.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ builds:
3636
output: true
3737
- cmd: codesign -vvv --deep --strict "dist/macos-builds_{{.Target}}/{{.Name}}"
3838
output: true
39-
- cmd: ls -l "dist/macos_{{.Target}}"
40-
output: true
4139
- cmd: hdiutil create -volname "STACKIT-CLI" -srcfolder "dist/macos-builds_{{.Target}}/{{.Name}}" -ov -format UDZO "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"
4240
output: true
4341
- cmd: codesign -s "{{.Env.APPLE_APPLICATION_IDENTITY}}" -f -v --options=runtime "dist/{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.dmg"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ lint: lint-golangci-lint lint-yamllint
2525
# Test
2626
test:
2727
@echo ">> Running tests for the CLI application"
28-
@go test ./... -count=1
28+
@go test ./... -count=1 -coverprofile=coverage.out
2929

3030
# Test coverage
3131
coverage:

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ require (
1919
github.com/stackitcloud/stackit-sdk-go/services/alb v0.5.0
2020
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.7.0
2121
github.com/stackitcloud/stackit-sdk-go/services/dns v0.15.0
22-
github.com/stackitcloud/stackit-sdk-go/services/git v0.5.0
22+
github.com/stackitcloud/stackit-sdk-go/services/git v0.5.1
2323
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.24.0
24-
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0
25-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.0
24+
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.1
25+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.1
2626
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.1.0
2727
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.16.0
2828
github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.2.1

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,8 @@ github.com/stackitcloud/stackit-sdk-go/services/authorization v0.7.0 h1:VpONplkd
570570
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.7.0/go.mod h1:dJ19ZwFjp2bfC5ZobXV3vUdSpE3quUw3GuoFSKLpHIo=
571571
github.com/stackitcloud/stackit-sdk-go/services/dns v0.15.0 h1:GQAA9gqhKN0ZRc1vRYURHeVjSghh+iF+5DK0HdeuakI=
572572
github.com/stackitcloud/stackit-sdk-go/services/dns v0.15.0/go.mod h1:PMHoavoIaRZpkI9BA0nsnRjGoHASVSBon45XB3QyhMA=
573-
github.com/stackitcloud/stackit-sdk-go/services/git v0.5.0 h1:s0A2EPBrnBxfKStKA/B1izbyYHw/0m2RdqN3Inkv9hI=
574-
github.com/stackitcloud/stackit-sdk-go/services/git v0.5.0/go.mod h1:XhXHJpOVC9Rpwyf1G+EpMbprBafH9aZb8vWBdR+z0WM=
573+
github.com/stackitcloud/stackit-sdk-go/services/git v0.5.1 h1:xs8CMY7t8nULQvZr5+XZRs8yWw8YMVw+HfjcuMhieR4=
574+
github.com/stackitcloud/stackit-sdk-go/services/git v0.5.1/go.mod h1:agI7SONeLR/IZL3TOgn1tDzfS63O2rWKQE8+huRjEzU=
575575
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.24.0 h1:aLlZmcsDHqqc7KPsevvs+W6EPZFT51u/dx5TcVQsE6g=
576576
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.24.0/go.mod h1:TaMx7kukGpRm0BkNCmS7u2x12q1pgfbD55DAnLIjOIQ=
577577
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.4.0 h1:Ef4SyTBjIkfwaws4mssa6AoK+OokHFtr7ZIflUpoXVE=
@@ -580,14 +580,14 @@ github.com/stackitcloud/stackit-sdk-go/services/logme v0.24.1 h1:hfnILDJGBwwqUIs
580580
github.com/stackitcloud/stackit-sdk-go/services/logme v0.24.1/go.mod h1:XjDMHhAQogFXsVR+o138CPYG1FOe0/Nl2Vm+fAgzx2A=
581581
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.1 h1:7nN7ZCuWSbJMy5KqoOqSbp5JKIOvyuDqVRtxVvT1iyE=
582582
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.1/go.mod h1:Pb8IEV5/jP8k75dVcN5cn3kP7PHTy/4KXXKpG76oj4U=
583-
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0 h1:U/IhjLOz0vG6zuxTqGhBd8f609s6JB+X9PaL6x/VM58=
584-
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0/go.mod h1:+JSnz5/AvGN5ek/iH008frRc/NgjSr1EVOTIbyLwAuQ=
583+
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.1 h1:TWz7qJ4Mg5pquDXODSZ1dzhS95ZYn3w1aKjuRU2VqCg=
584+
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.1/go.mod h1:U1Zf/S9IuDvRJq1tRKFT/bsJd4qxYzwtukqX3TL++Mw=
585585
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.2.0 h1:+dKIPVz9ydKbX3x6+1NvYk++OA378w74p+N6SjDmzBQ=
586586
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.2.0/go.mod h1:iCOYS9yICXQPyMAIdUGMqJDLY8HXKiVAdiMzO/mPvtA=
587587
github.com/stackitcloud/stackit-sdk-go/services/observability v0.7.1 h1:6OObzh2zk7wg75zYstcj0kjOjaxWc4joqA6qdeo8DP4=
588588
github.com/stackitcloud/stackit-sdk-go/services/observability v0.7.1/go.mod h1:+eNo7SEeVRuW7hgujSabSketScSUKGuC88UznPS+UTE=
589-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.0 h1:/OaZCyrD8LFa4W6a2Vu2QSVMJwLLBr8ZdBKzX00MV1Q=
590-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.0/go.mod h1:c30J6f/fXtbzcHkH3ZcabZUek3wfy5CRnEkcW5e5yXg=
589+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.1 h1:E6vCqPn1NiPHnbnvqLNQNz6a/cmeyRb5iA9cDUPtP58=
590+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.23.1/go.mod h1:ifKKKCWL1U435fXGQ375SPX+burtfg1I7EGZ58COzRA=
591591
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.1.0 h1:r29a9GoBLVw2VZSzdPftlIsE5t7shdxobwoT6NVUIjU=
592592
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.1.0/go.mod h1:4g/L5PHfz1xk3udEhvPy2nXiH4UgRO5Cj6iwUa7k5VQ=
593593
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.24.1 h1:2rDFwJtZOFYFUiJqJ9uIwM+mu+BbtuVaUHARRJtrZPU=

0 commit comments

Comments
 (0)