chore(dev-flow): maintain latest changes in main branch (eclipse-trac…

…tusx#177) get rid of the dev branch eclipse-tractusx/portal#243
dhiren-singh-007 · Jul 16, 2024 · 5899ac4 · 5899ac4
1 parent 476ce3f
commit 5899ac4
Show file tree

Hide file tree

Showing 19 changed files with 138 additions and 205 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -23,7 +23,6 @@ updates:
   # NuGet
   -
     package-ecosystem: "nuget"
-    target-branch: dev
     directory: /
     labels:
       - "dependabot"
@@ -42,7 +41,6 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: dev
     directory: /
     labels:
       - "dependabot"
@@ -56,7 +54,6 @@ updates:
   # Docker
   -
     package-ecosystem: "docker"
-    target-branch: dev
     directory: ./docker/
     labels:
       - "dependabot"

diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml
@@ -23,7 +23,7 @@ on:
   push:
     paths:
       - 'charts/ssi-credential-issuer/**'
-    branches: [main, dev, release-candidate]
+    branches: [main]
   pull_request:
     paths:
       - 'charts/ssi-credential-issuer/**'

diff --git a/.github/workflows/credential-expiry-app-docker.yml b/.github/workflows/credential-expiry-app-docker.yml
@@ -30,7 +30,7 @@ on:
       - 'docker/Dockerfile-credential-expiry-app'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -63,7 +63,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

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -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
@@ -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, dev]

diff --git a/.github/workflows/migrations-docker.yml b/.github/workflows/migrations-docker.yml
@@ -19,7 +19,7 @@
 
 name: Build Migrations Image
 
-on: 
+on:
   push:
     paths:
       # service and transitive paths
@@ -31,7 +31,7 @@ on:
       - 'docker/Dockerfile-credential-issuer-migrations'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -64,7 +64,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

diff --git a/.github/workflows/processes-worker-docker.yml b/.github/workflows/processes-worker-docker.yml
@@ -30,7 +30,7 @@ on:
       - 'docker/Dockerfile-credential-issuer-processes-worker'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -63,7 +63,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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,9 @@ on:
     paths:
       - 'charts/**'
     branches:
-      - main
+      - 'main'
+      - 'release/v*.*.*'
+
 
 jobs:
   release-helm-chart:

diff --git a/.github/workflows/service-docker.yml b/.github/workflows/service-docker.yml
@@ -30,7 +30,7 @@ on:
       - 'docker/Dockerfile-credential-issuer-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -63,7 +63,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

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -20,7 +20,7 @@
 name: Sonarcloud
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:
@@ -48,14 +48,14 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Cache SonarCloud packages
-        uses: actions/cache@v4
+        uses: actions/cache@c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: ~/sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v4
+        uses: actions/cache@c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: ./.sonar/scanner
           key: ${{ runner.os }}-sonar-scanner

diff --git a/.github/workflows/trivy-dev.yml → .github/workflows/trivy-main.yml b/.github/workflows/trivy-dev.yml → .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,16 +89,16 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-service:main"
           format: "sarif"
-          output: "trivy-results3.sarif"
+          output: "trivy-results2.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results3.sarif"
+          sarif_file: "trivy-results2.sarif"
 
   analyze-ssi-credential-issuer-migrations:
     runs-on: ubuntu-latest
@@ -121,17 +121,17 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-migrations:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-migrations:main"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results3.sarif"
           vuln-type: "os,library"
           skip-dirs: "docs/"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results9.sarif"
+          sarif_file: "trivy-results3.sarif"
 
   analyze-ssi-credential-expiry-app:
     runs-on: ubuntu-latest
@@ -154,17 +154,17 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-expiry-app:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-expiry-app:main"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results4.sarif"
           vuln-type: "os,library"
           skip-dirs: "docs/"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results9.sarif"
+          sarif_file: "trivy-results4.sarif"
 
   analyze-ssi-credential-issuer-processes-worker:
     runs-on: ubuntu-latest
@@ -187,15 +187,14 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-processes-worker:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-processes-worker:main"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results5.sarif"
           vuln-type: "os,library"
           skip-dirs: "docs/"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results9.sarif"
-
+          sarif_file: "trivy-results5.sarif"
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -24,7 +24,7 @@ name: "Trivy Stable"
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   # pull_request:
   # The branches below must be a subset of the branches above
   # branches: [ main, master ]
@@ -92,14 +92,14 @@ jobs:
           # Path to Docker image
           image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-service:latest"
           format: "sarif"
-          output: "trivy-results3.sarif"
+          output: "trivy-results2.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results3.sarif"
+          sarif_file: "trivy-results2.sarif"
 
   analyze-ssi-credential-issuer-migrations:
     runs-on: ubuntu-latest
@@ -124,14 +124,14 @@ jobs:
           # Path to Docker image
           image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-migrations:latest"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results3.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results9.sarif"
+          sarif_file: "trivy-results3.sarif"
 
   analyze-ssi-credential-expiry-app:
     runs-on: ubuntu-latest
@@ -156,15 +156,15 @@ jobs:
           # Path to Docker image
           image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-expiry-app:latest"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results4.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results9.sarif"
-        
+          sarif_file: "trivy-results4.sarif"
+
   analyze-ssi-credential-issuer-processes-worker:
     runs-on: ubuntu-latest
     permissions:
@@ -188,12 +188,11 @@ jobs:
           # Path to Docker image
           image-ref: "${{ env.IMAGE_NAMESPACE }}/ssi-credential-issuer-processes-worker:latest"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results5.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
-          sarif_file: "trivy-results9.sarif"
-
+          sarif_file: "trivy-results5.sarif"
diff --git a/.github/workflows/unit.tests-formatting.yml b/.github/workflows/unit.tests-formatting.yml
@@ -21,7 +21,7 @@ name: Unit-Tests and Formatting
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:
@@ -39,7 +39,7 @@ jobs:
         dotnet-version: ['8.0']
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
         uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
         with:

diff --git a/docs/technical-documentation/dev-process/Dev-flow_deploy-dev-env.md b/docs/technical-documentation/dev-process/Dev-flow_deploy-dev-env.md
@@ -7,7 +7,7 @@ flowchart LR
     end
     subgraph eclipse-tractusx
         direction LR
-        D -- PR* to dev*--> SCI(ssi-credential-issuer**)
+        D -- PR* to main*--> SCI(ssi-credential-issuer**)
         click SCI "https://github.com/eclipse-tractusx/ssi-credential-issuer"
     end
     subgraph Argo CD - sync to k8s cluster