From 8f2e57533351a6a127d61c9e7d1d84825369dbfa Mon Sep 17 00:00:00 2001 From: Marcin Dobrochowski <39153236+anoipm@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:33:17 +0200 Subject: [PATCH 1/3] normalize github script names (#517) --- .../scripts/{create_changelog.sh => create-changelog.sh} | 0 .../{create_draft_release.sh => create-draft-release.sh} | 0 .github/scripts/{publish_release.sh => publish-release.sh} | 0 .github/workflows/create-release.yaml | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename .github/scripts/{create_changelog.sh => create-changelog.sh} (100%) rename .github/scripts/{create_draft_release.sh => create-draft-release.sh} (100%) rename .github/scripts/{publish_release.sh => publish-release.sh} (100%) diff --git a/.github/scripts/create_changelog.sh b/.github/scripts/create-changelog.sh similarity index 100% rename from .github/scripts/create_changelog.sh rename to .github/scripts/create-changelog.sh diff --git a/.github/scripts/create_draft_release.sh b/.github/scripts/create-draft-release.sh similarity index 100% rename from .github/scripts/create_draft_release.sh rename to .github/scripts/create-draft-release.sh diff --git a/.github/scripts/publish_release.sh b/.github/scripts/publish-release.sh similarity index 100% rename from .github/scripts/publish_release.sh rename to .github/scripts/publish-release.sh diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index 86c02e8b..84018753 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -91,14 +91,14 @@ jobs: - name: Create changelog env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./.github/scripts/create_changelog.sh ${{ github.event.inputs.name }} + run: ./.github/scripts/create-changelog.sh ${{ github.event.inputs.name }} - name: Create draft release id: create-draft env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - RELEASE_ID=$(./.github/scripts/create_draft_release.sh ${{ github.event.inputs.name }}) + RELEASE_ID=$(./.github/scripts/create-draft-release.sh ${{ github.event.inputs.name }}) echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT - name: Create release assets @@ -132,4 +132,4 @@ jobs: - name: Publish release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./.github/scripts/publish_release.sh ${{ needs.create-draft.outputs.release_id }} ${{ github.event.inputs.latest_release }} + run: ./.github/scripts/publish-release.sh ${{ needs.create-draft.outputs.release_id }} ${{ github.event.inputs.latest_release }} From 184ccdfa5b9987529e9fcfad008aed354b73d25f Mon Sep 17 00:00:00 2001 From: Marcin Dobrochowski <39153236+anoipm@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:40:26 +0200 Subject: [PATCH 2/3] Simplify release id for assets (#518) --- .github/scripts/release.sh | 27 +++------------------------ .github/workflows/create-release.yaml | 1 + 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/scripts/release.sh b/.github/scripts/release.sh index 511331d2..0917dfee 100755 --- a/.github/scripts/release.sh +++ b/.github/scripts/release.sh @@ -7,8 +7,9 @@ set -E # needs to be set if we want the ERR trap set -o pipefail # prevents errors in a pipeline from being masked # Expected variables: -# PULL_BASE_REF - name of the tag -# GITHUB_TOKEN - github token used to upload the template yaml +PULL_BASE_REF=${PULL_BASE_REF?"Define PULL_BASE_REF env"} # name of the tag +GITHUB_TOKEN=${GITHUB_TOKEN?"Define GITHUB_TOKEN env"} # github token used to upload the template yaml +RELEASE_ID=${RELEASE_ID?"Define RELEASE_ID env"} # github token used to upload the template yaml uploadFile() { filePath=${1} @@ -37,28 +38,6 @@ MODULE_VERSION=${PULL_BASE_REF} make render-manifest echo "Generated keda-manager.yaml:" cat keda-manager.yaml -echo "Fetching releases" -CURL_RESPONSE=$(curl -w "%{http_code}" -sL \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer $GITHUB_TOKEN" \ - https://api.github.com/repos/kyma-project/keda-manager/releases) -JSON_RESPONSE=$(sed '$ d' <<< "${CURL_RESPONSE}") -HTTP_CODE=$(tail -n1 <<< "${CURL_RESPONSE}") -if [[ "${HTTP_CODE}" != "200" ]]; then - echo "${CURL_RESPONSE}" - exit 1 -fi - -echo "Finding release id for: ${PULL_BASE_REF}" -RELEASE_ID=$(jq <<< ${JSON_RESPONSE} --arg tag "${PULL_BASE_REF}" '.[] | select(.tag_name == $ARGS.named.tag) | .id') - -echo "Got '${RELEASE_ID}' release id" -if [ -z "${RELEASE_ID}" ] -then - echo "No release with tag = ${PULL_BASE_REF}" - exit 1 -fi - echo "Updating github release with assets" UPLOAD_URL="https://uploads.github.com/repos/kyma-project/keda-manager/releases/${RELEASE_ID}/assets" diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index 84018753..16f78b9a 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -106,6 +106,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PULL_BASE_REF: ${{ github.event.inputs.name }} + RELEASE_ID: ${{ steps.create-draft.outputs.release_id }} run: ./.github/scripts/release.sh outputs: From bb9125751396faa0f527ace024674d929302ea46 Mon Sep 17 00:00:00 2001 From: Andrzej Pankowski Date: Fri, 11 Oct 2024 10:40:18 +0200 Subject: [PATCH 3/3] bump1300 (#519) --- .github/actions/create-k3d-cluster/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/create-k3d-cluster/action.yaml b/.github/actions/create-k3d-cluster/action.yaml index 24b0ddd5..a580c0d8 100644 --- a/.github/actions/create-k3d-cluster/action.yaml +++ b/.github/actions/create-k3d-cluster/action.yaml @@ -10,7 +10,7 @@ runs: cluster-name: "k3dCluster" args: >- --agents 1 - --image rancher/k3s:v1.29.3-k3s1 + --image rancher/k3s:v1.30.0-k3s1 --port 80:80@loadbalancer --port 443:443@loadbalancer --wait