From 2dedd8b990304613c9826b7a6dbc0faba8a14cf8 Mon Sep 17 00:00:00 2001 From: Nikita Pivkin Date: Mon, 14 Aug 2023 15:15:28 +0700 Subject: [PATCH 1/2] fix sed --- .github/workflows/bump-trivy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-trivy.yaml b/.github/workflows/bump-trivy.yaml index 32a8b20..d51d075 100644 --- a/.github/workflows/bump-trivy.yaml +++ b/.github/workflows/bump-trivy.yaml @@ -11,14 +11,14 @@ on: run-name: Bump trivy to v${{ inputs.trivy_version }} jobs: - bump: + bump-trivy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Update Trivy versions run: | sed -r -i "s/ghcr.io\/aquasecurity\/trivy:[0-9]+\.[0-9]+\.[0-9]+/ghcr.io\/aquasecurity\/trivy:${{ inputs.trivy_version }}/" Dockerfile - sed -r -i "s/TRIVY_VERSION: [0-9]+\.[0-9]+\.[0-9]+/TRIVY_VERSION: ${{ inputs.trivy_version }}/" .github/workflows/build.yaml + sed -r -i "s/TRIVY_VERSION: 0\.[0-9]+\.[0-9]+/TRIVY_VERSION: ${{ inputs.trivy_version }}/" .github/workflows/build.yaml find test/data -type f -name '*.test' | xargs sed -r -i 's/"version": "[0-9]+\.[0-9]+\.[0-9]+"/"version": "${{ inputs.trivy_version }}"/' - name: Create PR From f673b720793d8229b4bd790bdb3879dee526bae8 Mon Sep 17 00:00:00 2001 From: Nikita Pivkin Date: Tue, 15 Aug 2023 15:31:24 +0700 Subject: [PATCH 2/2] change only trivy version --- .github/workflows/bump-trivy.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bump-trivy.yaml b/.github/workflows/bump-trivy.yaml index d51d075..9823c61 100644 --- a/.github/workflows/bump-trivy.yaml +++ b/.github/workflows/bump-trivy.yaml @@ -6,9 +6,9 @@ on: trivy_version: required: true type: string - description: the trivy version + description: the Trivy version -run-name: Bump trivy to v${{ inputs.trivy_version }} +run-name: Bump Trivy to v${{ inputs.trivy_version }} jobs: bump-trivy: @@ -17,9 +17,12 @@ jobs: - uses: actions/checkout@v3 - name: Update Trivy versions run: | - sed -r -i "s/ghcr.io\/aquasecurity\/trivy:[0-9]+\.[0-9]+\.[0-9]+/ghcr.io\/aquasecurity\/trivy:${{ inputs.trivy_version }}/" Dockerfile - sed -r -i "s/TRIVY_VERSION: 0\.[0-9]+\.[0-9]+/TRIVY_VERSION: ${{ inputs.trivy_version }}/" .github/workflows/build.yaml - find test/data -type f -name '*.test' | xargs sed -r -i 's/"version": "[0-9]+\.[0-9]+\.[0-9]+"/"version": "${{ inputs.trivy_version }}"/' + current_trivy_version=$(cat .github/workflows/build.yaml | sed -rn 's/TRIVY_VERSION: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p' | xargs) + sed -ri "s/ghcr.io\/aquasecurity\/trivy:$current_trivy_version/ghcr.io\/aquasecurity\/trivy:${{ inputs.trivy_version }}/" Dockerfile + sed -ri "s/TRIVY_VERSION: $current_trivy_version/TRIVY_VERSION: ${{ inputs.trivy_version }}/" .github/workflows/build.yaml + find test/data -type f -name '*.test' \ + | xargs sed -ri \ + "s/\"version\": \"$current_trivy_version\"/\"version\": \"${{ inputs.trivy_version }}\"/" - name: Create PR id: create-pr