Skip to content

Commit e19ff46

Browse files
authored
fix failure at eval pr infos (#49)
1 parent 2205080 commit e19ff46

File tree

4 files changed

+30
-17
lines changed

4 files changed

+30
-17
lines changed

.github/workflows/Release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
id: tag
3434
shell: bash
3535
run: |
36-
echo "Building version: $(awesome-ci pr info -format 'version')"
36+
awesome-ci pr info
3737
echo "::set-output name=version::$(awesome-ci pr info -format 'version')"
3838
echo "::set-output name=pr::$(awesome-ci pr info -format 'pr')"
3939
echo "::set-output name=releaseid::$ACI_RELEASE_ID"
@@ -92,8 +92,8 @@ jobs:
9292
key: awesome-ci-${{ github.sha }}
9393

9494
- name: Create Release
95-
run: awesome-ci release publish -releaseid ${{ needs.generate_tag.outputs.releaseid }} -upload "file=out/$ARTIFACT1,file=out/$ARTIFACT2"
95+
run: awesome-ci release publish -releaseid ${{ needs.generate_infos.outputs.releaseid }} -upload "file=out/$ARTIFACT1,file=out/$ARTIFACT2"
9696
env:
9797
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
98-
ARTIFACT1: awesome-ci_${{ needs.generate_tag.outputs.version }}_amd64
99-
ARTIFACT2: awesome-ci_${{ needs.generate_tag.outputs.version }}_arm64
98+
ARTIFACT1: awesome-ci_${{ needs.generate_infos.outputs.version }}_amd64
99+
ARTIFACT2: awesome-ci_${{ needs.generate_infos.outputs.version }}_arm64

.github/workflows/branchPR.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ jobs:
2626
id: tag
2727
shell: bash
2828
run: |
29-
echo "Building version: $(awesome-ci pr info -number ${{ github.event.pull_request.number }} -format 'version')"
30-
echo "::set-output name=version::$(awesome-ci pr info -number ${{ github.event.pull_request.number }} -format 'version')"
31-
echo "::set-output name=pr::$(awesome-ci pr info -number ${{ github.event.pull_request.number }} -format 'pr')"
29+
awesome-ci pr info -number ${{ github.event.pull_request.number }}
30+
export
31+
echo "::set-output name=releaseid::$ACI_RELEASE_ID"
32+
echo "::set-output name=version::$ACI_VERSION"
33+
echo "::set-output name=pr::$ACI_PR"
3234
env:
3335
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3436

src/service/pullrequest.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@ type PullRequestInfoSet struct {
2121
}
2222

2323
func PrintPRInfos(args *PullRequestInfoSet) {
24+
var prNumber int
2425
_, err := acigithub.NewGitHubClient()
2526
if err != nil {
2627
log.Fatalln(err)
2728
}
28-
prInfos, _, err := acigithub.GetPrInfos(args.Number)
29+
30+
if args.Number == 0 {
31+
prNumber, err = evalPrNumber(&args.Number)
32+
if err != nil {
33+
log.Fatalln(err)
34+
}
35+
} else {
36+
prNumber = args.Number
37+
}
38+
39+
prInfos, _, err := acigithub.GetPrInfos(prNumber)
2940
if err != nil {
3041
log.Fatalln(err)
3142
}

tests/github_env

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ACI_PR=2
2-
ACI_PR_SHA=3c9c1c20efc10d8b0e144a98df22a485fdcf4811
3-
ACI_PR_SHA_SHORT=3c9c1c20
4-
ACI_PR_BRANCH=bugfix/test
1+
ACI_PR=49
2+
ACI_PR_SHA=e7ba37033082cd1086490a8428725a512b9773de
3+
ACI_PR_SHA_SHORT=e7ba3703
4+
ACI_PR_BRANCH=bugfix/pr-info
55
ACI_ORGA=playground
6-
ACI_PATCH_LEVEL=major
7-
ACI_VERSION=1.0.0
8-
ACI_LATEST_VERSION=0.11.0
9-
ACI_OWNER=eksrvb
10-
ACI_REPO=playground
6+
ACI_PATCH_LEVEL=bugfix
7+
ACI_VERSION=0.7.7
8+
ACI_LATEST_VERSION=0.7.6
9+
ACI_OWNER=fullstack-devops
10+
ACI_REPO=awesome-ci
1111
ACI_RELEASE_ID=57228901

0 commit comments

Comments
 (0)