From 513761d5ac713f6a3967e4c5c891bda33dd28e18 Mon Sep 17 00:00:00 2001 From: Anurag Rajawat Date: Wed, 11 Dec 2024 09:45:53 +0530 Subject: [PATCH] CI: Fix stable release job Signed-off-by: Anurag Rajawat --- .github/workflows/stable-release.yaml | 26 +++----------------------- hack/update-image-tag.sh | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 23 deletions(-) create mode 100755 hack/update-image-tag.sh diff --git a/.github/workflows/stable-release.yaml b/.github/workflows/stable-release.yaml index 783b3ce..13d45e4 100644 --- a/.github/workflows/stable-release.yaml +++ b/.github/workflows/stable-release.yaml @@ -15,27 +15,8 @@ concurrency: cancel-in-progress: true jobs: - files-changed: - name: Find out which files were changed - runs-on: ubuntu-latest - timeout-minutes: 5 - outputs: - sentryflow: ${{ steps.filter.outputs.sentryflow}} - envoyfilter: ${{ steps.filter.outputs.envoyfilter}} - steps: - - uses: actions/checkout@v4 - - uses: dorny/paths-filter@v3.0.2 - id: filter - with: - filters: | - sentryflow: - - 'sentryflow/**' - envoyfilter: - - 'filter/envoy/envoy-wasm-filters/**' - release-sentryflow-image: - needs: [ files-changed ] - if: ${{ github.repository == '5GSEC/sentryflow' && needs.files-changed.outputs.sentryflow == 'true' }} + if: ${{ github.repository == '5GSEC/sentryflow' }} name: Build and push sentryflow image uses: ./.github/workflows/release-image.yaml with: @@ -44,8 +25,7 @@ jobs: secrets: inherit release-envoy-filter-image: - needs: [ files-changed ] - if: ${{ github.repository == '5GSEC/sentryflow' && needs.files-changed.outputs.envoyfilter == 'true' }} + if: ${{ github.repository == '5GSEC/sentryflow' }} name: Build and push envoyfilter's image uses: ./.github/workflows/release-image.yaml with: @@ -54,7 +34,7 @@ jobs: secrets: inherit update-image-tags-in-helm-charts: - if: github.repository == '5GSEC/sentryflow' + if: ${{ github.repository == '5GSEC/sentryflow' }} needs: [ release-sentryflow-image ] permissions: pull-requests: write diff --git a/hack/update-image-tag.sh b/hack/update-image-tag.sh new file mode 100755 index 0000000..84c90fd --- /dev/null +++ b/hack/update-image-tag.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2024 Authors of SentryFlow + +if ! command -v yq > /dev/null; then + echo "Installing yq..." + go install github.com/mikefarah/yq/v4@latest +fi + +TAG=$1 +DEPLOYMENT_ROOT_DIR="deployments/sentryflow" + +echo "Updating tag to ${TAG}" +yq -i ".image.tag = \"$TAG\"" "${DEPLOYMENT_ROOT_DIR}/values.yaml"