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

get rid of the dev branch eclipse-tractusx/portal#243
eclipse-tractusx · Jun 20, 2024 · 111e36a · 111e36a
1 parent 73b3d03
commit 111e36a
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 51 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/administration-service.yml b/.github/workflows/administration-service.yml
@@ -38,7 +38,7 @@ on:
       - 'docker/Dockerfile-administration-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -74,7 +74,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
@@ -120,5 +120,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/administration-service-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/codeql.yml b/.github/workflows/codeql.yml
@@ -33,7 +33,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:

diff --git 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/iam-seeding.yml b/.github/workflows/iam-seeding.yml
@@ -31,7 +31,7 @@ on:
       - 'docker/Dockerfile-iam-seeding'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -67,7 +67,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/kics.yml b/.github/workflows/kics.yml
@@ -21,10 +21,10 @@ 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]
+  # branches: [main]
   # paths-ignore:
   #   - "**/*.md"
   #   - "**/*.txt"

diff --git a/.github/workflows/maintenance-service.yml b/.github/workflows/maintenance-service.yml
@@ -32,7 +32,7 @@ on:
       - 'docker/Dockerfile-maintenance-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -68,7 +68,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
@@ -114,5 +114,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/maintenance-service-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/marketplace-app-service.yml b/.github/workflows/marketplace-app-service.yml
@@ -37,7 +37,7 @@ on:
       - 'docker/Dockerfile-marketplace-app-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -73,7 +73,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
@@ -119,5 +119,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/marketplace-app-service-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/notification-service.yml b/.github/workflows/notification-service.yml
@@ -34,7 +34,7 @@ on:
       - 'docker/Dockerfile-notification-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -71,7 +71,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
@@ -117,5 +117,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/notification-service-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/portal-migrations.yml b/.github/workflows/portal-migrations.yml
@@ -32,7 +32,7 @@ on:
       - 'docker/Dockerfile-portal-migrations'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -68,7 +68,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
@@ -114,5 +114,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-migrations-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/pre-checks.yml b/.github/workflows/pre-checks.yml
@@ -23,7 +23,7 @@ name: Pre Checks
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:

diff --git a/.github/workflows/processes-worker.yml b/.github/workflows/processes-worker.yml
@@ -39,7 +39,7 @@ on:
       - 'docker/Dockerfile-processes-worker'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -75,7 +75,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
@@ -121,5 +121,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/processes-worker-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/provisioning-migrations.yml b/.github/workflows/provisioning-migrations.yml
@@ -32,7 +32,7 @@ on:
       - 'docker/Dockerfile-provisioning-migrations'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -68,7 +68,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
@@ -114,5 +114,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/provisioning-migrations-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/registration-service.yml b/.github/workflows/registration-service.yml
@@ -36,7 +36,7 @@ on:
       - 'docker/Dockerfile-registration-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -72,7 +72,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
@@ -118,5 +118,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/registration-service-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/release.yml b/.github/workflows/release.yml
@@ -162,7 +162,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/services-service.yml b/.github/workflows/services-service.yml
@@ -36,7 +36,7 @@ on:
       - 'docker/Dockerfile-services-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -72,7 +72,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
@@ -118,5 +118,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/services-service-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/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -20,7 +20,7 @@
 name: Sonarcloud
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
       - 'tests/**'