Skip to content

Commit

Permalink
revert: github action steps splitting reverted
Browse files Browse the repository at this point in the history
  • Loading branch information
DrPsychick committed Dec 29, 2024
1 parent 500f806 commit 63b3d72
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 37 deletions.
24 changes: 3 additions & 21 deletions .github/workflows/lint-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ jobs:

update-readme-metadata:
runs-on: ubuntu-latest
permissions:
contents: write
needs: lint-and-test
steps:
- name: Install readme-generator-for-helm
run: npm install -g @bitnami/readme-generator-for-helm
Expand All @@ -92,27 +95,6 @@ jobs:
echo "Updating README.md for mailu chart"
readme-generator --values "charts/mailu/values.yaml" --readme "charts/mailu/README.md" --schema "/tmp/schema.json"
- uses: actions/cache@v4
with:
key: README.md
path: charts/mailu/README.md

push-readme-changes:
runs-on: ubuntu-latest
permissions:
contents: write
needs: [lint-and-test,update-readme-metadata]
steps:
- name: Checkout mailu/helm-charts
uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: actions/cache/restore@v4
with:
key: README.md
path: charts/mailu/README.md

- name: Push changes
run: |
# Push all the changes
Expand Down
19 changes: 3 additions & 16 deletions .github/workflows/trivy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch: {}

permissions:
security-events: write

jobs:
trivy-scan:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -51,22 +54,6 @@ jobs:
scan-ref: '.'
trivy-config: '.trivy.yaml'

- uses: actions/cache@v4
with:
key: trivy-results
path: trivy-results.sarif

trivy-publish:
runs-on: ubuntu-latest
permissions:
security-events: write
needs: trivy-scan
steps:
- uses: actions/cache/restore@v4
with:
key: trivy-results
path: trivy-results.sarif

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v3
with:
Expand Down

0 comments on commit 63b3d72

Please # to comment.