diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d86cb46c4..2ee11a224 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -20,3 +20,20 @@ updates: # Check daily schedule: interval: "daily" + + # 1.0 release branch + - package-ecosystem: "maven" + directory: "/" + target-branch: "1.0" + schedule: + interval: "daily" + - package-ecosystem: "docker" + directory: "/docker" + target-branch: "1.0" + schedule: + interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "1.0" + schedule: + interval: "daily" \ No newline at end of file diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index dc4e6c48a..fc45d1d57 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -2,9 +2,9 @@ name: "CodeQL Advanced" on: push: - branches: [ "master" ] + branches: [ "master", "1.0" ] pull_request: - branches: [ "master" ] + branches: [ "master", "1.0" ] schedule: - cron: '15 18 * * 3' diff --git a/.github/workflows/vulnerability-scan.yaml b/.github/workflows/vulnerability-scan.yaml index fe5328b7f..147b1f28e 100644 --- a/.github/workflows/vulnerability-scan.yaml +++ b/.github/workflows/vulnerability-scan.yaml @@ -15,10 +15,14 @@ jobs: trivy-scan: # only on original eclipse-hawkbit/hawkbit repo or when manually triggered if: github.repository == 'eclipse-hawkbit/hawkbit' || github.event_name == 'workflow_dispatch' + strategy: + matrix: + branch: [master, "1.0"] uses: ./.github/workflows/reusable_workflow_trivy-scan.yaml permissions: contents: read security-events: write + # Enable Upload for both branches with: - ref: ${{ github.ref }} - upload: ${{ github.ref == 'refs/heads/master' }} \ No newline at end of file + ref: ${{ matrix.branch }} + upload: true \ No newline at end of file