Skip to content

Commit 2205080

Browse files
eksrhaeksrha
authored
tune pr-workflow (#48)
1 parent 13119ac commit 2205080

File tree

2 files changed

+47
-78
lines changed

2 files changed

+47
-78
lines changed

‎.github/workflows/Release.yaml‎

Lines changed: 26 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,30 @@ jobs:
1515
generate_infos:
1616
runs-on: ubuntu-latest
1717
outputs:
18-
tag: ${{ steps.tag.outputs.version }}
18+
releaseid: ${{ steps.tag.outputs.releaseid }}
19+
version: ${{ steps.tag.outputs.version }}
1920
pr: ${{ steps.tag.outputs.pr }}
2021
steps:
2122
- name: Check out the repo
2223
uses: actions/checkout@v2
23-
with:
24-
ref: main
25-
fetch-depth: 0
26-
- name: Set up awesome-ci
27-
run: |
28-
wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
29-
chmod +x awesome-ci
30-
- id: tag
24+
- name: Setup awesome-ci
25+
uses: fullstack-devops/awesome-ci-action@main
26+
27+
- name: Create release
28+
run: awesome-ci release create
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
32+
- name: collect infos
33+
id: tag
3134
shell: bash
3235
run: |
33-
echo "Building version: 0.8.0"
34-
echo "::set-output name=version::\"0.8.0\""
36+
echo "Building version: $(awesome-ci pr info -format 'version')"
37+
echo "::set-output name=version::$(awesome-ci pr info -format 'version')"
38+
echo "::set-output name=pr::$(awesome-ci pr info -format 'pr')"
39+
echo "::set-output name=releaseid::$ACI_RELEASE_ID"
40+
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3542

3643
build:
3744
runs-on: ubuntu-latest
@@ -46,41 +53,22 @@ jobs:
4653
uses: actions/setup-go@v2
4754
with:
4855
go-version: 1.17
49-
- name: Set up awesome-ci
50-
run: |
51-
wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
52-
chmod +x awesome-ci
53-
54-
- name: debugging git
55-
run: |
56-
echo "git name-rev HEAD: $(git name-rev HEAD)"
57-
echo "git log -1 --pretty=format:"%s": $(git log -1 --pretty=format:"%s")"
58-
echo "git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@': $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')"
59-
- name: set build Infos
60-
run: ./awesome-ci getBuildInfos
61-
env:
62-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6356

6457
- name: Build "${{ matrix.arch }}"
65-
run: go build -v -ldflags "-X main.version=$ACI_NEXT_VERSION" -o out/
58+
run: go build -v -ldflags "-X main.version=${{ needs.generate_infos.outputs.version }}" -o out/awesome-ci_${{ needs.generate_infos.outputs.version }}_${{ matrix.arch }}
6659
env:
6760
GOOS: linux
6861
GOARCH: "${{ matrix.arch }}"
6962

70-
- name: rename buildable
71-
working-directory: out
72-
run: mv awesome-ci awesome-ci_${{ needs.generate_tag.outputs.version }}_${{ matrix.arch }}
73-
7463
- name: Cache build outputs
7564
uses: actions/cache@v2
7665
env:
7766
cache-name: cache-outputs-modules
7867
with:
7968
path: out/
80-
key: awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}-${{ hashFiles('out/awesome-ci*') }}
69+
key: awesome-ci-${{ github.sha }}-${{ hashFiles('out/awesome-ci*') }}
8170
restore-keys: |
82-
awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}
83-
71+
awesome-ci-${{ github.sha }}
8472
#- name: Integration testing
8573
# run: ./tools/test.sh ./out/awesome-ci_${ACI_NEXT_VERSION}_${{ matrix.arch }}
8674
# env:
@@ -92,27 +80,19 @@ jobs:
9280
steps:
9381
- name: Checkout code
9482
uses: actions/checkout@v2
95-
- name: Set up awesome-ci
96-
run: |
97-
wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
98-
chmod +x awesome-ci
83+
- name: Setup awesome-ci
84+
uses: fullstack-devops/awesome-ci-action@main
9985

100-
- name: get cache build outputs
86+
- name: get cached build outputs
10187
uses: actions/cache@v2
10288
env:
10389
cache-name: cache-outputs-modules
10490
with:
10591
path: out/
106-
key: awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}
107-
restore-keys: |
108-
awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}
109-
110-
- name: get generated artifacts
111-
working-directory: out
112-
run: ls -la
92+
key: awesome-ci-${{ github.sha }}
11393

11494
- name: Create Release
115-
run: ./awesome-ci createRelease -uploadArtifacts "file=out/$ARTIFACT1,file=out/$ARTIFACT2"
95+
run: awesome-ci release publish -releaseid ${{ needs.generate_tag.outputs.releaseid }} -upload "file=out/$ARTIFACT1,file=out/$ARTIFACT2"
11696
env:
11797
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11898
ARTIFACT1: awesome-ci_${{ needs.generate_tag.outputs.version }}_amd64

‎.github/workflows/branchPR.yaml‎

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,23 @@ jobs:
1414
generate_infos:
1515
runs-on: ubuntu-latest
1616
outputs:
17-
tag: ${{ steps.tag.outputs.version }}
17+
version: ${{ steps.tag.outputs.version }}
1818
pr: ${{ steps.tag.outputs.pr }}
1919
steps:
2020
- name: Check out the repo
2121
uses: actions/checkout@v2
22-
with:
23-
ref: main
24-
fetch-depth: 0
25-
- name: Set up awesome-ci
26-
run: |
27-
wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
28-
chmod +x awesome-ci
29-
- id: tag
22+
- name: Setup awesome-ci
23+
uses: fullstack-devops/awesome-ci-action@main
24+
25+
- name: collect infos
26+
id: tag
3027
shell: bash
3128
run: |
32-
echo "Building version: $(awesome-ci getBuildInfos -format 'version')"
33-
echo "::set-output name=version::$(awesome-ci getBuildInfos -format 'version')"
34-
echo "::set-output name=pr::$(awesome-ci getBuildInfos -format 'pr')"
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')"
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3534

3635
build:
3736
runs-on: ubuntu-latest
@@ -46,40 +45,34 @@ jobs:
4645
uses: actions/setup-go@v2
4746
with:
4847
go-version: 1.17
49-
- name: Set up awesome-ci
50-
run: |
51-
wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
52-
chmod +x awesome-ci
48+
- name: Setup awesome-ci
49+
uses: fullstack-devops/awesome-ci-action@main
5350

5451
- name: debugging git
5552
run: |
5653
echo "git name-rev HEAD: $(git name-rev HEAD)"
5754
echo "git log -1 --pretty=format:"%s": $(git log -1 --pretty=format:"%s")"
5855
echo "git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@': $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')"
5956
- name: set build Infos
60-
run: ./awesome-ci getBuildInfos
57+
run: awesome-ci pr info -number ${{ github.event.pull_request.number }}
6158
env:
6259
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6360

6461
- name: Build "${{ matrix.arch }}"
65-
run: go build -v -ldflags "-X main.version=$ACI_NEXT_VERSION" -o out/
62+
run: go build -v -ldflags "-X main.version=${{ needs.generate_infos.outputs.version }}" -o out/awesome-ci_${{ needs.generate_infos.outputs.version }}_${{ matrix.arch }}
6663
env:
6764
GOOS: linux
6865
GOARCH: "${{ matrix.arch }}"
6966

70-
- name: rename buildable
71-
working-directory: out
72-
run: mv awesome-ci awesome-ci_${{ needs.generate_tag.outputs.version }}_${{ matrix.arch }}
73-
7467
- name: Cache build outputs
7568
uses: actions/cache@v2
7669
env:
7770
cache-name: cache-outputs-modules
7871
with:
7972
path: out/
80-
key: awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}-${{ hashFiles('out/awesome-ci*') }}
73+
key: awesome-ci-${{ github.event.pull_request.head.sha }}-${{ hashFiles('out/awesome-ci*') }}
8174
restore-keys: |
82-
awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}
75+
awesome-ci-${{ github.event.pull_request.head.sha }}
8376
8477
#- name: Integration testing
8578
# run: ./tools/test.sh ./out/awesome-ci_${ACI_NEXT_VERSION}_${{ matrix.arch }}
@@ -92,20 +85,16 @@ jobs:
9285
steps:
9386
- name: Checkout code
9487
uses: actions/checkout@v2
95-
- name: Set up awesome-ci
96-
run: |
97-
wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
98-
chmod +x awesome-ci
88+
- name: Setup awesome-ci
89+
uses: fullstack-devops/awesome-ci-action@main
9990

100-
- name: Cache build outputs
91+
- name: get cached build outputs
10192
uses: actions/cache@v2
10293
env:
10394
cache-name: cache-outputs-modules
10495
with:
10596
path: out/
106-
key: awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}
107-
restore-keys: |
108-
awesome-ci-${{ needs.generate_tag.outputs.version }}-pr-${{ needs.generate_tag.outputs.pr }}
97+
key: awesome-ci-${{ github.event.pull_request.head.sha }}
10998

11099
- name: get generated artifacts
111100
working-directory: out

0 commit comments

Comments
 (0)