Skip to content

Commit

Permalink
Merge branch 'main' into extend-helm-chart-options
Browse files Browse the repository at this point in the history
  • Loading branch information
vakaobr authored Nov 1, 2024
2 parents 7a115b1 + 16c485e commit eec061e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
17 changes: 4 additions & 13 deletions .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
name: create_release
on:
workflow_dispatch:
pull_request:
branches:
- main
- release-**
types: [closed]
on:
push:
tags:
- 'v*'

permissions:
contents: write

jobs:
create-release:
if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'update manifest and helm charts')
runs-on: ubuntu-20.04
steps:
- name: Harden Runner
Expand All @@ -28,12 +25,6 @@ jobs:
with:
go-version: "1.23"
check-latest: true
- id: get-tag
name: Get tag
run: echo "tag=$(echo ${{ github.event.pull_request.head.ref }} | sed -e 's/release-//g')" >> $GITHUB_OUTPUT
- name: Create tag
run: |
git tag ${{ steps.get-tag.outputs.tag }}
- name: Goreleaser
uses: goreleaser/goreleaser-action@336e29918d653399e599bfca99fadc1d7ffbc9f7 # v4.3.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: SARIF file
path: results.sarif
Expand Down

0 comments on commit eec061e

Please sign in to comment.