8000 Fixes wrongly appended "v" to the appVersion by Ilyesbdlala · Pull Request #819 · secureCodeBox/secureCodeBox · GitHub
[go: up one dir, main page]
Skip to content

Fixes wrongly appended "v" to the appVersion #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J12934 merged 10 commits into from
Nov 17, 2021
Merged

Fixes wrongly appended "v" to the appVersion #819

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c748310
SCB bot now makes sure the release and local version have same format
Ilyesbdlala Nov 16, 2021
e5ce1c7
fixed wrong variable formatting
Ilyesbdlala Nov 16, 2021
be8e7d3
intializes remote release version variable in scb-bot
Ilyesbdlala Nov 16, 2021
44ea30d
fix empty variable for matching scanner versions
Ilyesbdlala Nov 16, 2021
83a3615
fixes missing variable
Ilyesbdlala Nov 16, 2021
3ec9162
Merge branch 'main' into bugfix/scb-bot-version-control
Ilyesbdlala Nov 16, 2021
51ea91a
restored the commented out section in the scb bot workflow
Ilyesbdlala Nov 16, 2021
89d12c8
removed redundant v character in upgrade 8000 step
Ilyesbdlala Nov 16, 2021
80b710d
Added checking if release version is null
Ilyesbdlala Nov 16, 2021
eef02f1
removed on push trigger for scb-bot
Ilyesbdlala Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions .github/workflows/scb-bot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,37 @@ jobs:
git-user-signingkey: true
git-commit-gpgsign: true

- name: Fetch local scanner version
uses: mikefarah/yq@v4.4.1
with:
cmd: echo local=$(yq e .appVersion scanners/${{ matrix.scanner }}/Chart.yaml) >> $GITHUB_ENV

- name: Fetch scanner's version API
uses: mikefarah/yq@v4.4.1
with:
cmd: echo versionApi=$(yq e .annotations.versionApi scanners/${{ matrix.scanner }}/Chart.yaml) >> $GITHUB_ENV

- name: Fetch latest release scanner version
run: echo release=$((curl -sL ${{env.versionApi}} ) | jq -r ".tag_name") | tr -d "v" >> $GITHUB_ENV

- name: Fetch local scanner version
uses: mikefarah/yq@v4.4.1
with:
cmd: echo local=$(yq e .appVersion scanners/${{ matrix.scanner }}/Chart.yaml) | tr -d "v" >> $GITHUB_ENV
# A hacky way to solve the problem where the docker image is in the "1.0" format and the github release is in the "v1.0" format
# We make sure to add or remove the "v" character when necessary
run: |
local=${{env.local}}
release=$(curl -sL ${{env.versionApi}} | jq -r ".tag_name" )
upgrade=$release

if [[ ${local:0:1} != ${release:0:1} ]] ; then
if [[ ${local:0:1} == "v" ]] ; then
upgrade=v${release};
elif [[ ${release:0:1} == "v" ]] ; then
upgrade=$(echo $release| tr -d "v")
fi
fi

echo $upgrade
echo release=$upgrade >> $GITHUB_ENV

- name: Check if scanner is outdated and if PR already exists
if: ${{ env.release != env.local }}
if: ${{ env.release != env.local && env.release != null }}
run: |
echo 'The ${{ matrix.scanner }} scanner is outdated. Current SCB version is ${{env.local}} and remote version is ${{env.release}}'

Expand All @@ -61,15 +77,15 @@ jobs:
echo prExists=$(gh pr list --state open --limit 100 | grep -F "$pullRequestTitle" -c) >> $GITHUB_ENV

- name: Fetch new release changelog
if: ${{ env.release != env.local }}
if: ${{ env.release != env.local && env.release != null }}
run: echo releaseChangelog=$((curl -sL ${{env.versionApi}} ) | jq -r ".body") >> $GITHUB_ENV

- name: Upgrade Scanner Helm Chart
if: ${{ env.release != env.local && env.prExists == 0 }}
if: ${{ env.release != env.local && env.prExists == 0 && env.release != null}}
uses: mikefarah/yq@v4.4.1
with:
# appVersion value in chart is replaced with release value. Empty lines are deleted in the process
cmd: yq e --inplace '.appVersion = "v${{env.release}}"' ./scanners/${{ matrix.scanner }}/Chart.yaml
cmd: yq e --inplace '.appVersion = "${{env.release}}"' ./scanners/${{ matrix.scanner }}/Chart.yaml

# Updating Helm Docs
- name: Download Helm Docs
Expand Down Expand Up @@ -111,7 +127,7 @@ jobs:
rm -rf helm-docs

- name: Create Pull Request
if: ${{ env.release != env.local && env.prExists == 0 }}
if: ${{ env.release != env.local && env.prExists == 0 && env.release != null }}
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.SCB_BOT_USER_TOKEN }}
Expand Down
0