diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 487500a0..7da1e3e9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,7 +23,6 @@ updates: # NPM - package-ecosystem: "npm" - target-branch: dev directory: / labels: - "dependabot" @@ -43,7 +42,6 @@ updates: # Github Actions - package-ecosystem: "github-actions" - target-branch: dev directory: / labels: - "dependabot" @@ -57,7 +55,6 @@ updates: # Docker - package-ecosystem: "docker" - target-branch: dev directory: ./.conf/ labels: - "dependabot" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8979139f..580c82cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ name: build on: push: branches: - - 'dev' + - 'main' workflow_dispatch: env: @@ -80,7 +80,7 @@ jobs: with: images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} tags: | - type=raw,value=dev + type=raw,value=main type=raw,value=${{ github.sha }} - name: Build and push Docker image @@ -125,5 +125,5 @@ jobs: --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-registration-image-update.yml/dispatches \ --header "authorization: Bearer $TOKEN" \ --header "Accept: application/vnd.github.v3+json" \ - --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \ + --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \ --fail diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index ca2af351..16485d8c 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -21,7 +21,7 @@ name: Check Dependencies on: push: - branches: [main, dev] + branches: [main] pull_request: types: [opened, synchronize, reopened] workflow_dispatch: diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index d4532f10..83b90e7d 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -21,7 +21,7 @@ name: "KICS" on: push: - branches: [main, dev] + branches: [main] # pull_request: # The branches below must be a subset of the branches above # branches: [main, master] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bab83b6..9f5b7b91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -170,7 +170,7 @@ jobs: if [[ ${{ steps.rc-check.outputs.rc }} == 'true' ]]; then echo "branch=release-candidate" >> $GITHUB_OUTPUT else - echo "branch=dev" >> $GITHUB_OUTPUT + echo "branch=main" >> $GITHUB_OUTPUT fi if: steps.hf-check.outputs.hf == 'false' diff --git a/.github/workflows/trivy-dev.yml b/.github/workflows/trivy-main.yml similarity index 98% rename from .github/workflows/trivy-dev.yml rename to .github/workflows/trivy-main.yml index 18eadcb4..c9ca0208 100644 --- a/.github/workflows/trivy-dev.yml +++ b/.github/workflows/trivy-main.yml @@ -20,11 +20,11 @@ # Depending on the location of your Docker container # you need to change the path to the specific Docker registry. # -name: "Trivy Dev" +name: "Trivy Main" on: push: - branches: [ dev ] + branches: [main] # pull_request: # The branches below must be a subset of the branches above # branches: [ main, master ] @@ -89,7 +89,7 @@ jobs: uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 # v0.19.0 with: # Path to Docker image - image-ref: "${{ env.IMAGE_NAMESPACE}}/${{ env.IMAGE_NAME }}:dev" + image-ref: "${{ env.IMAGE_NAMESPACE}}/${{ env.IMAGE_NAME }}:main" format: "sarif" output: "trivy-results2.sarif" vuln-type: "os,library"