Skip to content

Commit d43262a

Browse files
Refactor Github Action per b/485167538
1 parent ec522e6 commit d43262a

2 files changed

Lines changed: 23 additions & 13 deletions

File tree

.github/workflows/draft-release.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
if: steps.regex-match.outputs.group1 != ''
3131
run: |
3232
echo "::set-output name=applicable::true"
33-
echo "This is a release commit: ${{ steps.regex-match.outputs.group1 }}"
33+
echo "This is a release commit: ${STEPS_REGEX_MATCH_OUTPUTS_GROUP1}"
34+
env:
35+
STEPS_REGEX_MATCH_OUTPUTS_GROUP1: ${{ steps.regex-match.outputs.group1 }}
3436
outputs:
3537
applicable: ${{ steps.check-commit-message.outputs.applicable }}
3638
version: ${{ steps.regex-match.outputs.group1 }}
@@ -50,15 +52,17 @@ jobs:
5052

5153
- name: Calculate Tag and Release names
5254
run: |
53-
echo TAG_NAME="v${{ needs.check.outputs.version }}" >> $GITHUB_ENV
54-
echo RELEASE_NAME="v${{ needs.check.outputs.version }} Release" >> $GITHUB_ENV
55+
echo TAG_NAME="v${NEEDS_CHECK_OUTPUTS_VERSION}" >> $GITHUB_ENV
56+
echo RELEASE_NAME="v${NEEDS_CHECK_OUTPUTS_VERSION} Release" >> $GITHUB_ENV
57+
env:
58+
NEEDS_CHECK_OUTPUTS_VERSION: ${{ needs.check.outputs.version }}
5559

5660
- name: Create and push Tag
5761
run: |
5862
git config --local user.email "action@github.com"
5963
git config --local user.name "GitHub Action"
60-
git tag -a ${{ env.TAG_NAME }} -m "${{ env.RELEASE_NAME }}"
61-
git push origin ${{ env.TAG_NAME }}
64+
git tag -a ${TAG_NAME} -m "${RELEASE_NAME}"
65+
git push origin ${TAG_NAME}
6266
6367
- name: Install gsutil
6468
run: |
@@ -74,20 +78,20 @@ jobs:
7478
while [ $found -lt 10 -a $retries -gt 0 ]
7579
do
7680
sleep 3m
77-
found=$(gsutil du gs://skaffold/releases/${{ env.TAG_NAME }}/ | wc -l)
81+
found=$(gsutil du gs://skaffold/releases/${TAG_NAME}/ | wc -l)
7882
retries=$((retries-1))
7983
done
80-
gsutil -m cp -r gs://skaffold/releases/${{ env.TAG_NAME }}/ $HOME
84+
gsutil -m cp -r gs://skaffold/releases/${TAG_NAME}/ $HOME
8185
8286
- name: Create Release
8387
shell: bash
8488
run: |
8589
curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
8690
body=$(git log -p --follow -1 CHANGELOG.md | grep '^\+' | cut -c 2- | tail -n +2)
8791
assets=()
88-
for asset in $HOME/${{ env.TAG_NAME }}/*; do
92+
for asset in $HOME/${TAG_NAME}/*; do
8993
assets+=("-a" "$asset")
9094
done
91-
bin/hub release create "${assets[@]}" -m "${{ env.RELEASE_NAME }}" -m "$body" --draft ${{ env.TAG_NAME }}
95+
bin/hub release create "${assets[@]}" -m "${RELEASE_NAME}" -m "$body" --draft ${TAG_NAME}
9296
env:
9397
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/performance-comparison.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ jobs:
9494
- name: Make and install Skaffold binary from current PR
9595
run: |
9696
make
97-
sudo install "${HOME}/work/skaffold/skaffold/out/skaffold" /usr/local/bin/skaffold-${{ steps.comment-branch.outputs.head_ref }}
97+
sudo install "${HOME}/work/skaffold/skaffold/out/skaffold" /usr/local/bin/skaffold-${STEPS_COMMENT_BRANCH_OUTPUTS_HEAD_REF}
98+
env:
99+
STEPS_COMMENT_BRANCH_OUTPUTS_HEAD_REF: ${{ steps.comment-branch.outputs.head_ref }}
98100

99101
- name: Install Skaffold from main branch (built from CI/CD on merge)
100102
run: |
@@ -103,18 +105,22 @@ jobs:
103105
104106
- name: Parse Comment To Yaml Format
105107
run: |
106-
tail -n +2 <<< '${{ github.event.comment.body }}' > yaml-input-file.yaml
108+
tail -n +2 <<< '${GITHUB_EVENT_COMMENT_BODY}' > yaml-input-file.yaml
109+
env:
110+
GITHUB_EVENT_COMMENT_BODY: ${{ github.event.comment.body }}
107111

108112
- name: Run performance comparison benchmarks
109113
id: run-performance-comparison-benchmarks
110114
run: |
111-
/usr/local/bin/skaffold-${{ steps.comment-branch.outputs.head_ref }} config set --global collect-metrics false
112-
make COMPARISONSTATS_ARGS='--summary-output-path=gh-comment.txt --yaml-input-file=yaml-input-file.yaml --warmup-runs=1 /usr/local/bin/skaffold-from-main-branch /usr/local/bin/skaffold-${{ steps.comment-branch.outputs.head_ref }} helm-deployment main.go "//per-dev-iteration-comment"' comparisonstats
115+
/usr/local/bin/skaffold-${STEPS_COMMENT_BRANCH_OUTPUTS_HEAD_REF} config set --global collect-metrics false
116+
make COMPARISONSTATS_ARGS='--summary-output-path=gh-comment.txt --yaml-input-file=yaml-input-file.yaml --warmup-runs=1 /usr/local/bin/skaffold-from-main-branch /usr/local/bin/skaffold-${STEPS_COMMENT_BRANCH_OUTPUTS_HEAD_REF} helm-deployment main.go "//per-dev-iteration-comment"' comparisonstats
113117
body=$(cat gh-comment.txt)
114118
body="${body//'%'/'%25'}"
115119
body="${body//$'\n'/'%0A'}"
116120
body="${body//$'\r'/'%0D'}"
117121
echo ::set-output name=body::$body
122+
env:
123+
STEPS_COMMENT_BRANCH_OUTPUTS_HEAD_REF: ${{ steps.comment-branch.outputs.head_ref }}
118124

119125
- name: Create comment
120126
uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae

0 commit comments

Comments
 (0)