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

get rid of the dev branch #243
eclipse-tractusx · Jun 21, 2024 · f2081af · f2081af
1 parent 8259aec
commit f2081af
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 69 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -23,7 +23,6 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: dev
     directory: /
     labels:
       - "dependabot"

diff --git a/.github/workflows/localdev-chart-test.yaml b/.github/workflows/localdev-chart-test.yaml
@@ -23,7 +23,7 @@ on:
   # push:
   #   paths:
   #     - 'charts/localdev/**'
-  #   branches: [main, dev]
+  #   branches: [main]
   # pull_request:
   #   paths:
   #     - 'charts/localdev/**'

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

diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/consortia/argocd-app-templates/appsetup-dev.yaml
@@ -28,7 +28,7 @@ spec:
   source:
     path: charts/portal
     repoURL: 'https://github.com/eclipse-tractusx/portal.git'
-    targetRevision: dev
+    targetRevision: main
     plugin:
       env:
         - name: AVP_SECRET

diff --git a/consortia/argocd-app-templates/appsetup-upgrade.yaml b/consortia/argocd-app-templates/appsetup-upgrade.yaml
diff --git a/consortia/environments/values-upgrade.yaml b/consortia/environments/values-upgrade.yaml