fix: Cleanup ci

splunk · Feb 10, 2021 · eb32822 · eb32822
1 parent e8b580d
commit eb32822
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 83 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,87 +7,6 @@ version: 2.1
 orbs:
   python: circleci/python@0.2.1
 
-  splunk-release:
-    executors:
-      python37:
-        docker:
-          - image: circleci/python:3.7
-    commands:
-      tag:
-        parameters:
-          gh_user:
-            description: Git Hub username
-            type: string
-          gh_token:
-            description: Git Hub token
-            type: string
-          tag_level:
-            description: Tag level
-            type: string
-        steps:
-          - run:
-              name: TAG
-              command: |
-                git remote set-url origin https://<<parameters.gh_user>>:<<parameters.gh_token>>@github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git
-                ./semtag <<parameters.tag_level>>
-      merge-to-master:
-        parameters:
-          gh_user:
-            description: Git Hub username
-            type: string
-          gh_token:
-            description: Git Hub token
-            type: string
-        steps:
-          - run:
-              name: Merge
-              command: |
-                git remote set-url origin https://<<parameters.gh_user>>:<<parameters.gh_token>>@github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git
-                git config --global user.email "addonreleasesrv@splunk.com"
-                git config --global user.name "Add on release service"
-                git pull origin master
-                git merge master -m "Merge from master"
-                git checkout master
-                git merge develop
-                git push
-    jobs:
-      tag:
-        parameters:
-          gh_user:
-            description: Git Hub username
-            type: string
-          gh_token:
-            description: Git Hub token
-            type: string
-          tag_level:
-            description: Tag level
-            type: string
-        executor: python37
-        steps:
-          - checkout
-          - tag:
-              tag_level: <<parameters.tag_level>>
-              gh_user: <<parameters.gh_user>>
-              gh_token: <<parameters.gh_token>>
-      merge-to-master:
-        executor: python37
-        parameters:
-          gh_user:
-            description: Git Hub username
-            type: string
-          gh_token:
-            description: Git Hub token
-            type: string
-        steps:
-          - checkout
-          - merge-to-master:
-              gh_user: <<parameters.gh_user>>
-              gh_token: <<parameters.gh_token>>
-
-executors:
-  linux:
-    machine:
-      image: ubuntu-1604:201903-01
 jobs:
   build:
     docker:

diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
@@ -21,7 +21,7 @@ jobs:
           path-to-signatures: ".github/signatures/version1/cla.json"
           path-to-document: "https://github.com/splunk/addonfactory-test-releaseci/blob/main/CLA.md" # e.g. a CLA or a DCO document
           # branch should not be protected
-          branch: "master"
+          branch: "main"
           allowlist: dependabot
           #below are the optional inputs - If the optional inputs are not given, then default values will be taken
           #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)

diff --git a/.github/workflows/release-notes.yaml b/.github/workflows/release-notes.yaml
@@ -15,7 +15,7 @@ jobs:
           git fetch --prune --unshallow --tags
       - uses: snyk/release-notes-preview@v1.6.1
         with:
-          releaseBranch: master
+          releaseBranch: main
         env:
           GITHUB_PR_USERNAME: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}