You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/07/10 12:15:22 UTC
[camel-k] branch main updated (546e576a8 -> f6f18e408)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 546e576a8 chore(deps): bump github.com/container-tools/spectrum
new 87298f9c5 chore: Coverage report workflow rework
new f6f18e408 feat: added workflow to handle comment on pr
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/coverage-report-comment.yml | 86 ++++++++++++++++++
.github/workflows/coverage-report.yml | 123 +++++++-------------------
2 files changed, 119 insertions(+), 90 deletions(-)
create mode 100644 .github/workflows/coverage-report-comment.yml
[camel-k] 02/02: feat: added workflow to handle comment on pr
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f6f18e4081f263328fc609828ab26d1f9b550725
Author: Martin Olsiak <ma...@gmail.com>
AuthorDate: Mon Jul 10 13:34:15 2023 +0200
feat: added workflow to handle comment on pr
---
.github/workflows/coverage-report-comment.yml | 86 +++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/.github/workflows/coverage-report-comment.yml b/.github/workflows/coverage-report-comment.yml
new file mode 100644
index 000000000..a9c42d792
--- /dev/null
+++ b/.github/workflows/coverage-report-comment.yml
@@ -0,0 +1,86 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+name: coverage-report-comment
+
+on:
+ workflow_run:
+ workflows: ["coverage-report"]
+ types:
+ - completed
+
+jobs:
+ comment:
+ runs-on: ubuntu-latest
+ if : ${{ github.event.workflow_run.conclusion == 'success' }}
+ steps:
+ - name: 'Download artifact'
+ uses: actions/github-script@v3.1.0
+ with:
+ script: |
+ var artifacts = await github.actions.listWorkflowRunArtifacts({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ run_id: ${{github.event.workflow_run.id }},
+ });
+ var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+ return artifact.name == "pr"
+ })[0];
+ var download = await github.actions.downloadArtifact({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ artifact_id: matchArtifact.id,
+ archive_format: 'zip',
+ });
+ var fs = require('fs');
+ fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
+ - run: unzip pr.zip
+
+ - name: Comment Coverage
+ uses: actions/github-script@v6
+ with:
+ github-token: ${{secrets.GITHUB_TOKEN}}
+ script: |
+ var fs = require('fs');
+ var issue_number = Number(fs.readFileSync('./NR'));
+ var POS_DIFF = Number(fs.readFileSync('./POS_DIFF'));
+ var OLD_COV = Number(fs.readFileSync('./OLD_COV'));
+ var NEW_COV = Number(fs.readFileSync('./NEW_COV'));
+ var COV_DIFF = Number(fs.readFileSync('./COV_DIFF'));
+
+ if( POS_DIFF == 'POS'){
+ github.rest.issues.createComment({
+ issue_number: issue_number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ body: `:camel: **Thank you for contributing!** :camel: \n\n **Code Coverage Report** :heavy_check_mark:\n - Coverage changed from: **${OLD_COV}%** -> **${NEW_COV}%**\n- Coverage difference: +**${COV_DIFF}%**`
+ })
+ }else if(POS_DIFF == 'NEG'){
+ github.rest.issues.createComment({
+ issue_number: issue_number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ body: `:camel: **Thank you for contributing!** :camel: \n\n **Code Coverage Report** :warning:\n - Coverage changed from: **${OLD_COV}%** -> **${NEW_COV}%**\n- Coverage difference: **${COV_DIFF}%**`
+ })
+ }else{
+ github.rest.issues.createComment({
+ issue_number: issue_number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ body: `:camel: **Thank you for contributing!** :camel: \n\n **Code Coverage Report** :heavy_check_mark:\n - Coverage unchanged.`
+ })
+ }
\ No newline at end of file
[camel-k] 01/02: chore: Coverage report workflow rework
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 87298f9c5331a9f0a4be6d32853597f2de2bbae8
Author: Martin Olšiak <56...@users.noreply.github.com>
AuthorDate: Mon Jul 10 13:32:58 2023 +0200
chore: Coverage report workflow rework
---
.github/workflows/coverage-report.yml | 123 +++++++++-------------------------
1 file changed, 33 insertions(+), 90 deletions(-)
diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml
index 7d46bec9d..96371e955 100644
--- a/.github/workflows/coverage-report.yml
+++ b/.github/workflows/coverage-report.yml
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ---------------------------------------------------------------------------
-
-name: coverage report
+# test
+name: coverage-report
on:
pull_request_target:
@@ -36,115 +36,58 @@ jobs:
go-version: '1.18'
check-latest: true
+ - name: Checkout apache repo
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ repository: apache/camel-k
+ path: old
+
- name: Get Old Coverage
shell: bash
run: |
- git clone https://github.com/apache/camel-k.git
- cd camel-k
+ cd old
old_coverage="$(grep -o -P '(?<=Coverage-)(.*)(?=%)' README.adoc)"
cd ..
- rm -rf camel-k
+ echo "OLD_COV=$old_coverage" >> $GITHUB_ENV
- name: Checkout
- shell: bash
- run: |
- git clone ${{github.server_url}}/${{ github.repository }}.git
- cd camel-k
- git checkout ${{ github.event.pull_request.head.ref }}
-
- - name: Fetch
- shell: bash
- working-directory: ./camel-k
- env:
- CI_USER: "github-actions[bot]"
- CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
- run: |
- git config --local user.email "$CI_EMAIL"
- git config --local user.name "$CI_USER"
- git remote add upstream https://github.com/apache/camel-k.git
- git fetch upstream
-
- - name: Rebase
- shell: bash
- working-directory: ./camel-k
- env:
- CI_USER: "github-actions[bot]"
- CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
- CI_TOKEN: ${{ inputs.secretGithubToken }}
- run: |
- git pull --rebase upstream main && echo "rebaseAborted=0" >> $GITHUB_ENV || echo "rebaseAborted=1" >> $GITHUB_ENV
+ uses: actions/checkout@v3
+ with:
+ persist-credentials: false
+ fetch-depth: 0
+ path: new
- name: Get New Coverage
shell: bash
- working-directory: ./camel-k
- if: env.rebaseAborted != 1
- env:
- CI_USER: "github-actions[bot]"
- CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
- CI_TOKEN: ${{ inputs.secretGithubToken }}
run: |
+ cd new
go test -v ./... -covermode=count -coverprofile=coverage.out
go tool cover -func=coverage.out -o=coverage.out
new_coverage="$(grep -o -P '(?<=\(statements\))(.+)(?=%)' coverage.out | xargs)"
-
- echo "OLD - $old_coverage"
- echo "NEW - $new_coverage"
-
- coverage_difference=$(bc <<< $new_coverage-$old_coverage)
+ echo "NEW_COV=$new_coverage" >> $GITHUB_ENV
+
+ coverage_difference=`echo "$new_coverage-${{env.OLD_COV}}" | bc`
+ echo "COV_DIFF=$coverage_difference" >> $GITHUB_ENV
if (( $(echo "$coverage_difference > 0" |bc -l) )); then
- echo "POS_DIFF=POS" >> $GITHUB_ENV
+ echo "POS_DIFF=POS" >> $GITHUB_ENV
elif (( $(echo "$coverage_difference < 0" |bc -l) )); then
echo "POS_DIFF=NEG" >> $GITHUB_ENV
else
echo "POS_DIFF=ZERO" >> $GITHUB_ENV
fi
-
- echo "NEW_COV=$new_coverage" >> $GITHUB_ENV
- echo "OLD_COV=$old_coverage" >> $GITHUB_ENV
- echo "COV_DIFF=$coverage_difference" >> $GITHUB_ENV
-
- - name: Comment Coverage
- if: env.rebaseAborted != 1
- uses: actions/github-script@v6
- with:
- github-token: ${{secrets.GITHUB_TOKEN}}
- script: |
-
- if(${{env.POS_DIFF == 'POS'}}){
- github.rest.issues.createComment({
- issue_number: context.issue.number,
- owner: context.repo.owner,
- repo: context.repo.repo,
- body: ':camel: **Thank you for contributing!** :camel: \n\n **Code Coverage Report** :heavy_check_mark:\n - Coverage changed from: **${{env.OLD_COV}}%** -> **${{env.NEW_COV}}%**\n- Coverage difference: +**${{env.COV_DIFF}}%**'
- })
- }else if(${{env.POS_DIFF == 'NEG'}}){
- github.rest.issues.createComment({
- issue_number: context.issue.number,
- owner: context.repo.owner,
- repo: context.repo.repo,
- body: ':camel: **Thank you for contributing!** :camel: \n\n **Code Coverage Report** :warning:\n - Coverage changed from: **${{env.OLD_COV}}%** -> **${{env.NEW_COV}}%**\n- Coverage difference: **${{env.COV_DIFF}}%**'
- })
- }else{
- github.rest.issues.createComment({
- issue_number: context.issue.number,
- owner: context.repo.owner,
- repo: context.repo.repo,
- body: ':camel: **Thank you for contributing!** :camel: \n\n **Code Coverage Report** :heavy_check_mark:\n - Coverage unchanged.'
- })
- }
-
- - name: Comment Merge Conflicts
- if: env.rebaseAborted == 1
- uses: actions/github-script@v6
+ - name: Save env variables
+ run: |
+ mkdir -p ./pr
+ echo ${{ github.event.number }} > ./pr/NR
+ echo ${{env.OLD_COV}} > ./pr/OLD_COV
+ echo ${{env.NEW_COV}} > ./pr/NEW_COV
+ echo ${{env.COV_DIFF}} > ./pr/COV_DIFF
+ echo ${{env.POS_DIFF}} > ./pr/POS_DIFF
+ - uses: actions/upload-artifact@v2
with:
- github-token: ${{secrets.GITHUB_TOKEN}}
- script: |
- github.rest.issues.createComment({
- issue_number: context.issue.number,
- owner: context.repo.owner,
- repo: context.repo.repo,
- body: ':camel: **Thank you for contributing!** :camel: \n\n Unable to create **Coverage Report** :warning:. \n Merge conflicts found.'
- })
\ No newline at end of file
+ name: pr
+ path: pr/