Skip to content

Commit 42c4c4b

Browse files
eksrhaeksrha
authored
Merge pull request #76 from fullstack-devops/bugfix/updates
update dependencies
2 parents fdae68f + c98561d commit 42c4c4b

6 files changed

Lines changed: 39 additions & 54 deletions

File tree

‎.github/workflows/Release.yaml‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,14 @@ on:
1313
- "Makefile"
1414

1515
jobs:
16-
generate_infos:
17-
runs-on: ubuntu-latest
18-
outputs:
19-
releaseid: ${{ steps.tag.outputs.releaseid }}
20-
version: ${{ steps.tag.outputs.version }}
21-
pr: ${{ steps.tag.outputs.pr }}
22-
steps:
23-
- name: Check out the repo
24-
uses: actions/checkout@v2
25-
- name: Setup awesome-ci
26-
uses: fullstack-devops/awesome-ci-action@main
27-
28-
- name: collect infos and create release
29-
run: |
30-
awesome-ci release create -merge-sha ${{ github.sha }}
31-
env:
32-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33-
34-
- name: collect infos
35-
id: tag
36-
shell: bash
37-
run: |
38-
echo "::set-output name=version::$ACI_VERSION"
39-
echo "::set-output name=pr::$ACI_PR"
40-
echo "::set-output name=releaseid::$ACI_RELEASE_ID"
16+
create_release:
17+
uses: fullstack-devops/actions/.github/workflows/create-release.yml@main
18+
secrets:
19+
token: ${{ secrets.GITHUB_TOKEN }}
4120

4221
build:
4322
runs-on: ubuntu-latest
44-
needs: generate_infos
23+
needs: create_release
4524
strategy:
4625
matrix:
4726
arch: ["amd64", "arm64"]
@@ -54,7 +33,7 @@ jobs:
5433
go-version: 1.17
5534

5635
- name: Build "${{ matrix.arch }}"
57-
run: go build -v -ldflags "-X main.version=${{ needs.generate_infos.outputs.version }}" -o out/awesome-ci_${{ needs.generate_infos.outputs.version }}_${{ matrix.arch }}
36+
run: go build -v -ldflags "-X main.version=${{ needs.create_release.outputs.version }}" -o out/awesome-ci_${{ needs.generate_infos.outputs.version }}_${{ matrix.arch }}
5837
env:
5938
GOOS: linux
6039
GOARCH: "${{ matrix.arch }}"
@@ -75,7 +54,7 @@ jobs:
7554

7655
publish_release:
7756
runs-on: ubuntu-latest
78-
needs: [generate_infos, build]
57+
needs: [create_release, build]
7958
steps:
8059
- name: Checkout code
8160
uses: actions/checkout@v2
@@ -98,13 +77,13 @@ jobs:
9877
run: awesome-ci release publish -releaseid "$ACI_RELEASE_ID" -assets "file=out/$ARTIFACT1,file=out/$ARTIFACT2" -body "release-template.md"
9978
env:
10079
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
101-
ACI_RELEASE_ID: ${{ needs.generate_infos.outputs.releaseid }}
102-
ARTIFACT1: awesome-ci_${{ needs.generate_infos.outputs.version }}_amd64
103-
ARTIFACT2: awesome-ci_${{ needs.generate_infos.outputs.version }}_arm64
80+
ACI_RELEASE_ID: ${{ needs.create_release.outputs.releaseid }}
81+
ARTIFACT1: awesome-ci_${{ needs.create_release.outputs.version }}_amd64
82+
ARTIFACT2: awesome-ci_${{ needs.create_release.outputs.version }}_arm64
10483

10584
update_action:
10685
runs-on: ubuntu-latest
107-
needs: [generate_infos, publish_release]
86+
needs: [create_release, publish_release]
10887
steps:
10988
- name: Check out awesome-ci-action
11089
uses: actions/checkout@v2
@@ -127,4 +106,4 @@ jobs:
127106
git tag v$NEW_VERSION -m "update to version v$NEW_VERSION"
128107
git push --follow-tags
129108
env:
130-
NEW_VERSION: ${{ needs.generate_infos.outputs.version }}
109+
NEW_VERSION: ${{ needs.create_release.outputs.version }}

‎docs/index.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,20 @@ The patching of the version only takes effect if the merged branch begins with t
2828
2929
| SemVer | supported aliases | version example |
3030
| ------ | -------------------------------------------- | --------------- |
31-
| MAJOR | [comment PR](#major-specialties) or `major` | 1.2.3 => 2.0.0 |
31+
| MAJOR | `major` | 1.2.3 => 2.0.0 |
3232
| MINOR | `feature`, `feat` | 1.2.3 => 1.3.0 |
3333
| PATCH | `fix`, `bugfix`, `dependabot` | 1.2.3 => 1.2.4 |
3434

35+
> see also [override specialties](#override-specialties)
36+
3537
![awesome-ci release process](release-process.drawio.svg "awesome-ci release process")
3638
![awesome-ci workflow](aci-workflow.drawio.png "awesome-ci workflow")
3739

3840
> Hint: this tool automatically detects your environment. Supported are __Jenkins__, __GitHub Actions__ and ~~GitLab CI~~
3941
40-
### Major specialties
42+
### Override specialties
4143

42-
To create a major release, a member of the repos with write permissions must write a comment with the content `aci=major`. awesome-ci then creates a major release.
44+
To set some attributes during developement you can comment a pullrequest.
4345

4446
### Requiered and optional environment variables
4547

‎go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.17
44

55
require (
66
github.com/google/go-github/v39 v39.2.0
7-
github.com/xanzy/go-gitlab v0.54.4
7+
github.com/xanzy/go-gitlab v0.55.1
88
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
99
gopkg.in/yaml.v2 v2.4.0
1010
)
@@ -15,14 +15,15 @@ require (
1515
github.com/google/go-cmp v0.5.7 // indirect
1616
github.com/google/go-querystring v1.1.0 // indirect
1717
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
18-
github.com/hashicorp/go-hclog v1.0.0 // indirect
18+
github.com/hashicorp/go-hclog v1.1.0 // indirect
1919
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
2020
github.com/mattn/go-colorable v0.1.12 // indirect
2121
github.com/mattn/go-isatty v0.0.14 // indirect
2222
github.com/stretchr/testify v1.7.0 // indirect
23-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
24-
golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect
25-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
23+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
24+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
25+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
26+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
2627
google.golang.org/appengine v1.6.7 // indirect
2728
google.golang.org/protobuf v1.27.1 // indirect
2829
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect

‎go.sum‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng
113113
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
114114
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
115115
github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
116-
github.com/hashicorp/go-hclog v1.0.0 h1:bkKf0BeBXcSYa7f5Fyi9gMuQ8gNsxeiNpZjR6VxNZeo=
117-
github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
116+
github.com/hashicorp/go-hclog v1.1.0 h1:QsGcniKx5/LuX2eYoeL+Np3UKYPNaN7YKpTh29h8rbw=
117+
github.com/hashicorp/go-hclog v1.1.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
118118
github.com/hashicorp/go-retryablehttp v0.6.8/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
119119
github.com/hashicorp/go-retryablehttp v0.7.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4=
120120
github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
@@ -147,8 +147,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
147147
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
148148
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
149149
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
150-
github.com/xanzy/go-gitlab v0.54.4 h1:3CFEdQ9O+bFx3BsyuOK0gqgLPwnT2rwnPOjudV07wTw=
151-
github.com/xanzy/go-gitlab v0.54.4/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
150+
github.com/xanzy/go-gitlab v0.55.1 h1:IgX/DS9buV0AUz8fuJPQkdl0fQGfBiAsAHxpun8sNhg=
151+
github.com/xanzy/go-gitlab v0.55.1/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
152152
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
153153
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
154154
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -163,8 +163,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
163163
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
164164
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
165165
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
166-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
167-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
166+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
167+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
168168
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
169169
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
170170
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -223,8 +223,9 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
223223
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
224224
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
225225
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
226-
golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba h1:6u6sik+bn/y7vILcYkK3iwTBWN7WtBvB0+SZswQnbf8=
227-
golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
226+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
227+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
228+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
228229
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
229230
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
230231
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -272,24 +273,27 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w
272273
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
273274
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
274275
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
276+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
275277
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
276278
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
277279
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
278-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
279280
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
281+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c=
282+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
280283
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
281284
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
282285
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
283286
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
284287
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
285288
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
286289
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
290+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
287291
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
288292
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
289293
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
290294
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
291-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
292-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
295+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
296+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
293297
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
294298
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
295299
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

‎src/acigithub/pullrequest.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ func GetPrInfos(prNumber int, mergeCommitSha string) (standardPrInfos *models.St
4040
}
4141
var found int = 0
4242
for _, pr := range pullRequests {
43-
fmt.Println(*pr.MergeCommitSHA == mergeCommitSha, *pr.MergeCommitSHA)
4443
if *pr.MergeCommitSHA == mergeCommitSha {
4544
prInfos = pr
4645
found = found + 1

‎src/acigitlab/gitlab-client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func NewGitHubClient() (gitlabClient *gitlab.Client, err error) {
1919
if isgitlabCiToken {
2020
gitlabClient, err = gitlab.NewClient(gitlabCiToken)
2121
if err != nil {
22-
fmt.Errorf("error at initializing gitlab client: %v", err)
22+
return nil, fmt.Errorf("error at initializing gitlab client: %v", err)
2323
}
2424
} else {
2525
panic("Not running in GitLab CI?!")

0 commit comments

Comments
 (0)