Skip to content

Commit 3d68830

Browse files
committed
adjustment before review
1 parent 9788041 commit 3d68830

File tree

5 files changed

+10
-85
lines changed

5 files changed

+10
-85
lines changed

.github/scripts/create_changelog.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ echo "Previous release: ${PREVIOUS_RELEASE}"
2222

2323
echo "## What has changed" >> ${CHANGELOG_FILE}
2424

25-
git log ${PREVIOUS_RELEASE}..HEAD --pretty=tformat:"%h" --reverse | while read -r commit
25+
git log "${PREVIOUS_RELEASE}"..HEAD --pretty=tformat:"%h" --reverse | while read -r COMMIT
2626
do
27-
COMMIT_AUTHOR=$(curl -H "${GITHUB_AUTH_HEADER}" -sS "${GITHUB_URL}/commits/${commit}" | jq -r '.author.login')
27+
COMMIT_AUTHOR=$(curl -H "${GITHUB_AUTH_HEADER}" -sS "${GITHUB_URL}/commits/${COMMIT}" | jq -r '.author.login')
2828
if [ "${COMMIT_AUTHOR}" != "kyma-bot" ]; then
29-
git show -s ${commit} --format="* %s by @${COMMIT_AUTHOR}" >> ${CHANGELOG_FILE}
29+
git show -s "${COMMIT}" --format="* %s by @${COMMIT_AUTHOR}" >> ${CHANGELOG_FILE}
3030
fi
3131
done
3232

33-
NEW_CONTRIB=$$.new
33+
NEW_CONTRIB=$(mktemp --suffix=.new XXXXX)
3434

3535
join -v2 \
3636
<(curl -H "${GITHUB_AUTH_HEADER}" -sS "${GITHUB_URL}/compare/$(git rev-list --max-parents=0 HEAD)...${PREVIOUS_RELEASE}" | jq -r '.commits[].author.login' | sort -u) \
37-
<(curl -H "${GITHUB_AUTH_HEADER}" -sS "${GITHUB_URL}/compare/${PREVIOUS_RELEASE}...HEAD" | jq -r '.commits[].author.login' | sort -u) >${NEW_CONTRIB}
37+
<(curl -H "${GITHUB_AUTH_HEADER}" -sS "${GITHUB_URL}/compare/${PREVIOUS_RELEASE}...HEAD" | jq -r '.commits[].author.login' | sort -u) >"${NEW_CONTRIB}"
3838

39-
if [ -s ${NEW_CONTRIB} ]
39+
if [ -s "${NEW_CONTRIB}" ]
4040
then
4141
echo -e "\n## New contributors" >> ${CHANGELOG_FILE}
4242
while read -r user
@@ -47,10 +47,10 @@ then
4747
REF_PR=" in ${REF_PR}"
4848
fi
4949
echo "* @${user} made first contribution${REF_PR}" >> ${CHANGELOG_FILE}
50-
done <${NEW_CONTRIB}
50+
done <"${NEW_CONTRIB}"
5151
fi
5252

5353
echo -e "\n**Full changelog**: https://github.com/$REPOSITORY/compare/${PREVIOUS_RELEASE}...${RELEASE_TAG}" >> ${CHANGELOG_FILE}
5454

5555
# cleanup
56-
rm ${NEW_CONTRIB} || echo "cleaned up"
56+
rm "${NEW_CONTRIB}" || echo "cleaned up"

.github/scripts/verify-actions-status.sh

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/busola-backend-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ on:
55
inputs:
66
tag:
77
description: "Additional tag for built images"
8-
required: false
8+
required: true
99
type: string
10-
# default: latest
1110
push:
1211
branches:
1312
- main
@@ -32,4 +31,4 @@ jobs:
3231
with:
3332
name: busola-backend
3433
dockerfile: Dockerfile
35-
tags: ${{ inputs.tag }}
34+
tags: ${{ inputs.tag != '' && inputs.tag || 'latest' }}

.github/workflows/busola-web-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
description: "Additional tag for built images"
88
required: true
99
type: string
10-
default: latest
1110
push:
1211
branches:
1312
- main

.github/workflows/create-release.yml

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -17,51 +17,6 @@ permissions: # used by build images steps
1717
contents: write # This is required for actions/checkout and builds
1818

1919
jobs:
20-
# TODO: Do we need this check? Our tests on main depends on what have changed.
21-
# verify-head-status:
22-
# name: Verify HEAD
23-
# runs-on: ubuntu-latest
24-
#
25-
# steps:
26-
# - name: Checkout code
27-
# uses: actions/checkout@v4
28-
# with:
29-
# fetch-depth: 0
30-
#
31-
# - name: Verify github actions
32-
# run: ./.github/scripts/verify-actions-status.sh ${{ github.ref_name }}
33-
34-
# TODO: This steps cannot be executed on fork, so I need to adjust them later
35-
# upgrade-images:
36-
# name: Upgrade main images
37-
# needs: verify-head-status
38-
# runs-on: ubuntu-latest
39-
#
40-
# steps:
41-
# - name: Checkout code
42-
# uses: actions/checkout@v4
43-
# with:
44-
# token: ${{ secrets.BOT_TOKEN }}
45-
# fetch-depth: 0
46-
47-
# - name: Bump values.yaml
48-
# run: |
49-
# ./hack/replace_serverless_chart_images.sh all .
50-
# env:
51-
# IMG_DIRECTORY: "prod"
52-
# IMG_VERSION: ${{ github.event.inputs.name }}
53-
# PROJECT_ROOT: "."
54-
#
55-
#
56-
# - name: Commit&Push
57-
# run: |
58-
# git config --local user.email "team-otters@sap.com"
59-
# git config --local user.name "ottersbot"
60-
#
61-
# git add .
62-
# git commit --allow-empty -m "upgrade dependencies"
63-
# git push origin ${{ github.ref_name }}
64-
6520
build-web:
6621
name: Build Busola web
6722
uses: ./.github/workflows/busola-web-build.yml
@@ -73,7 +28,6 @@ jobs:
7328
with:
7429
tag: ${{ github.event.inputs.name }}
7530

76-
# TODO: Run integration tests?
7731
# integrations:
7832
# needs: create-draft
7933
# secrets: inherit

0 commit comments

Comments
 (0)