refactor: rename git branches (#218)

* refactor: update branch names and references in our documentation * publish packages to tractus-x
eclipse-tractusx · Apr 15, 2023 · da6afe0 · da6afe0
1 parent 406e137
commit da6afe0
Show file tree

Hide file tree

Showing 23 changed files with 77 additions and 73 deletions.
diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
@@ -86,6 +86,7 @@ runs:
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{raw}}
           type=match,pattern=\d.\d.\d
+          type=raw,value=latest,enable={{is_default_branch}}
           type=sha
 
     ###############################

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,8 +3,8 @@ version: 2
 updates:
   # Maven
   -
-    package-ecosystem: "maven"
-    target-branch: develop
+    package-ecosystem: "gradle"
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -15,7 +15,7 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: develop
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -26,7 +26,7 @@ updates:
   # Docker
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -35,7 +35,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql/src/main/docker/
     labels:
       - "dependabot"
@@ -44,7 +44,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-memory/src/main/docker/
     labels:
       - "dependabot"
@@ -53,7 +53,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -62,7 +62,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -27,7 +27,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   release:
@@ -44,7 +44,8 @@ on:
 
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -136,9 +137,9 @@ jobs:
       packages: write
     needs: [ secret-presence, build-controlplane, build-dataplane, build-extensions ]
 
-    # do not run on PR branches, do not run on main
+    # do not run on PR branches, do not run on releases
     if: |
-      needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/main'
+      needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
     steps:
       # Set-Up
       - name: Checkout
@@ -152,17 +153,17 @@ jobs:
           cache: 'gradle'
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       # publish snapshots
       - name: Publish snapshot versions
         run: |-
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGitHubPackagesRepository
         env:
-          #REPO: ${{ github.repository }}
-          REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
+          REPO: ${{ github.repository }}
+          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
@@ -29,13 +29,14 @@ on:
       - 'docs/**'
       - '**/*.md'
     branches:
-      - develop
+      - releases
       - release/**
       - main
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
@@ -79,7 +79,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           head: release/${{ github.event.inputs.version }}
-          base: main
+          base: releases
           title: Release version ${{ github.event.inputs.version }}
           reviewers: ${{ github.actor }}
           body: |-

diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
@@ -23,7 +23,7 @@ on:
     paths:
       - 'charts/**'
     branches:
-      - main
+      - releases
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
     paths-ignore:
@@ -50,7 +50,7 @@ jobs:
       name: chart-testing (list-changed)
       id: list-changed
       run: |
-        changed=$(ct list-changed --config ct.yaml --target-branch develop)
+        changed=$(ct list-changed --config ct.yaml --target-branch main)
         if [[ -n "$changed" ]]; then
           echo "::set-output name=changed::true"
         fi

diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -2,9 +2,9 @@ name: "KICS"
 
 on:
   push:
-    branches: [main, master, develop]
+    branches: [main, releases]
   pull_request:
-    branches: [main, master, develop]
+    branches: [main, releases]
   workflow_dispatch:
 
   schedule:

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
@@ -30,7 +30,8 @@ on:
         default: "tractusx"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -4,7 +4,7 @@ name: "Publish new release"
 on:
   pull_request:
     branches:
-      - main
+      - releases
       - support/*
     types:
       - closed
@@ -67,18 +67,17 @@ jobs:
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
         env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Publish release version
         run: |
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGithubPackagesRepository
         env:
-          #REPO: ${{ github.repository }}
-          REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
+          REPO: ${{ github.repository }}
+          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
   # Release: Helm Charts
   helm-release:
@@ -128,7 +127,7 @@ jobs:
 
           git push origin gh-pages
 
-  # Release: GitHub tag & release; Merges back main into develop; Starts a new development cycle;
+  # Release: GitHub tag & release; Merges back releases into main; Starts a new development cycle;
   github-release:
     name: Publish new github release
     needs: [ release-version ]
@@ -148,7 +147,7 @@ jobs:
         name: Checkout
         uses: actions/[email protected]
         with:
-          # 0 to fetch the full history due to upcoming merge of main into develop branch
+          # 0 to fetch the full history due to upcoming merge of releases into main branch
           fetch-depth: 0
       -
         name: Create Release Tag
@@ -185,15 +184,15 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
       -
-        name: Merge main back into develop and set new snapshot version
-        if: github.event.pull_request.base.ref == 'main'
+        name: Merge releases back into main and set new snapshot version
+        if: github.event.pull_request.base.ref == 'releases'
         run: |
           # Prepare git env
           git config user.name "GitHub actions"
           git config user.email [email protected]
 
-          # Merge main into develop
-          git checkout develop && git merge -X theirs main --no-commit --no-ff
+          # Merge releases into main
+          git checkout main && git merge -X theirs releases --no-commit --no-ff
 
           # Extract release version
           IFS=. read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH<<<"${{ env.RELEASE_VERSION }}"
@@ -204,8 +203,8 @@ jobs:
           # Persist the "version" in the gradle.properties
           sed -i "s/version=.*/version=$SNAPSHOT_VERSION/g" gradle.properties
 
-          # Commit and push to origin develop
+          # Commit and push to origin main
           git add gradle.properties
           git commit --message "Introduce new snapshot version $SNAPSHOT_VERSION"
 
-          git push origin develop
+          git push origin main
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -9,7 +9,7 @@ on:
     workflows: ["Build"]
     branches:
       - main
-      - develop
+      - releases
       - release/*
       - hotfix/*
     tags:
@@ -84,7 +84,7 @@ jobs:
         if: always()
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: "ghcr.io/${{ github.repository }}/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
+          image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
           format: "sarif"
           output: "trivy-results-${{ matrix.image }}.sarif"
           exit-code: "1"

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -25,7 +25,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   release:
@@ -39,6 +39,7 @@ on:
   workflow_dispatch:
 
 concurrency:
+  # cancel older running jobs on the same branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -247,7 +247,7 @@ spec:
             ## DATA PLANE ##
             ################
 
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/dataplane-selector-configuration
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/dataplane-selector-configuration
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
               value: {{ include "txdc.dataplane.url.control" . }}/transfer
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
@@ -276,7 +276,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
@@ -317,7 +317,7 @@ spec:
             ## DATA ENCRYPTION ##
             #####################
 
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/data-encryption
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/data-encryption
             - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
             - name: "EDC_DATA_ENCRYPTION_ALGORITHM"

diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -156,7 +156,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"