From 502f311de5c7edc37506b461b30caf9ea1407241 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Fri, 13 Dec 2024 18:08:36 +0530 Subject: [PATCH] chore: deprecate develop branch - use main Signed-off-by: Prashant Shahi --- .github/workflows/build.yaml | 1 - .github/workflows/docs.yml | 2 +- .github/workflows/e2e-k3s.yaml | 2 +- .github/workflows/jest-coverage-changes.yml | 5 +++-- .github/workflows/push.yaml | 1 - .github/workflows/sonar.yml | 1 - .github/workflows/staging-deployment.yaml | 6 +++--- .github/workflows/testing-deployment.yaml | 2 +- CONTRIBUTING.md | 4 ++-- deploy/README.md | 2 +- frontend/.husky/commit-msg | 5 ----- sample-apps/hotrod/README.md | 6 +++--- sample-apps/hotrod/hotrod-delete.sh | 2 +- sample-apps/hotrod/hotrod-install.sh | 2 +- 14 files changed, 17 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8b3e35b53f..275f0e9599 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,7 +3,6 @@ name: build-pipeline on: pull_request: branches: - - develop - main - release/v* diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index de2de959da..d7ecd688c0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: "Update PR labels and Block PR until related docs are shipped for the feat on: pull_request: branches: - - develop + - main types: [opened, edited, labeled, unlabeled] permissions: diff --git a/.github/workflows/e2e-k3s.yaml b/.github/workflows/e2e-k3s.yaml index ef5911f9b0..b09666fb80 100644 --- a/.github/workflows/e2e-k3s.yaml +++ b/.github/workflows/e2e-k3s.yaml @@ -42,7 +42,7 @@ jobs: kubectl create ns sample-application # apply hotrod k8s manifest file - kubectl -n sample-application apply -f https://raw.githubusercontent.com/SigNoz/signoz/develop/sample-apps/hotrod/hotrod.yaml + kubectl -n sample-application apply -f https://raw.githubusercontent.com/SigNoz/signoz/main/sample-apps/hotrod/hotrod.yaml # wait for all deployments in sample-application namespace to be READY kubectl -n sample-application get deploy --output name | xargs -r -n1 -t kubectl -n sample-application rollout status --timeout=300s diff --git a/.github/workflows/jest-coverage-changes.yml b/.github/workflows/jest-coverage-changes.yml index 56d4cf1b70..d5df9ce686 100644 --- a/.github/workflows/jest-coverage-changes.yml +++ b/.github/workflows/jest-coverage-changes.yml @@ -2,7 +2,8 @@ name: Jest Coverage - changed files on: pull_request: - branches: develop + branches: + - main jobs: build: @@ -11,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - ref: "refs/heads/develop" + ref: "refs/heads/main" token: ${{ secrets.GITHUB_TOKEN }} # Provide the GitHub token for authentication - name: Fetch branch diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index a440d2a5c7..e7123b8710 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - develop tags: - v* diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 8c62c12d1b..eff8de7c6b 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -3,7 +3,6 @@ on: pull_request: branches: - main - - develop paths: - 'frontend/**' defaults: diff --git a/.github/workflows/staging-deployment.yaml b/.github/workflows/staging-deployment.yaml index bbdbe32531..6125283a87 100644 --- a/.github/workflows/staging-deployment.yaml +++ b/.github/workflows/staging-deployment.yaml @@ -1,12 +1,12 @@ name: staging-deployment -# Trigger deployment only on push to develop branch +# Trigger deployment only on push to main branch on: push: branches: - - develop + - main jobs: deploy: - name: Deploy latest develop branch to staging + name: Deploy latest main branch to staging runs-on: ubuntu-latest environment: staging permissions: diff --git a/.github/workflows/testing-deployment.yaml b/.github/workflows/testing-deployment.yaml index 68a9b140cb..6362331e7b 100644 --- a/.github/workflows/testing-deployment.yaml +++ b/.github/workflows/testing-deployment.yaml @@ -44,7 +44,7 @@ jobs: git add . git stash push -m "stashed on $(date --iso-8601=seconds)" git fetch origin - git checkout develop + git checkout main git pull # This is added to include the scenerio when new commit in PR is force-pushed git branch -D ${GITHUB_BRANCH} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 613b225353..bed34bfd86 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -339,7 +339,7 @@ to make SigNoz UI available at [localhost:3301](http://localhost:3301) **5.1.1 To install the HotROD sample app:** ```bash -curl -sL https://github.com/SigNoz/signoz/raw/develop/sample-apps/hotrod/hotrod-install.sh \ +curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-install.sh \ | HELM_RELEASE=my-release SIGNOZ_NAMESPACE=platform bash ``` @@ -362,7 +362,7 @@ kubectl -n sample-application run strzal --image=djbingham/curl \ **5.1.4 To delete the HotROD sample app:** ```bash -curl -sL https://github.com/SigNoz/signoz/raw/develop/sample-apps/hotrod/hotrod-delete.sh \ +curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-delete.sh \ | HOTROD_NAMESPACE=sample-application bash ``` diff --git a/deploy/README.md b/deploy/README.md index 5e6740e6a7..55c3b6e8d4 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -58,7 +58,7 @@ from the HotROD application, you should see the data generated from hotrod in Si ```sh kubectl create ns sample-application -kubectl -n sample-application apply -f https://raw.githubusercontent.com/SigNoz/signoz/develop/sample-apps/hotrod/hotrod.yaml +kubectl -n sample-application apply -f https://raw.githubusercontent.com/SigNoz/signoz/main/sample-apps/hotrod/hotrod.yaml ``` To generate load: diff --git a/frontend/.husky/commit-msg b/frontend/.husky/commit-msg index cb50d87a2d..0afb1a6cb8 100755 --- a/frontend/.husky/commit-msg +++ b/frontend/.husky/commit-msg @@ -13,8 +13,3 @@ if [ "$branch" = "main" ]; then echo "${color_red}${bold}You can't commit directly to the main branch${reset}" exit 1 fi - -if [ "$branch" = "develop" ]; then - echo "${color_red}${bold}You can't commit directly to the develop branch${reset}" - exit 1 -fi \ No newline at end of file diff --git a/sample-apps/hotrod/README.md b/sample-apps/hotrod/README.md index b9638281a0..3498a06bd4 100644 --- a/sample-apps/hotrod/README.md +++ b/sample-apps/hotrod/README.md @@ -5,7 +5,7 @@ Follow the steps in this section to install a sample application named HotR.O.D, ```console kubectl create ns sample-application -kubectl -n sample-application apply -f https://github.com/SigNoz/signoz/raw/develop/sample-apps/hotrod/hotrod.yaml +kubectl -n sample-application apply -f https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod.yaml ``` In case, you have installed SigNoz in namespace other than `platform` or selected Helm release name other than `my-release`, follow the steps below: @@ -15,7 +15,7 @@ export HELM_RELEASE=my-release-2 export SIGNOZ_NAMESPACE=platform-2 export HOTROD_NAMESPACE=sample-application-2 -curl -sL https://github.com/SigNoz/signoz/raw/develop/sample-apps/hotrod/hotrod-install.sh | bash +curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-install.sh | bash ``` To delete sample application: @@ -23,7 +23,7 @@ To delete sample application: ```console export HOTROD_NAMESPACE=sample-application-2 -curl -sL https://github.com/SigNoz/signoz/raw/develop/sample-apps/hotrod/hotrod-delete.sh | bash +curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-delete.sh | bash ``` For testing with local scripts, you can use the following commands: diff --git a/sample-apps/hotrod/hotrod-delete.sh b/sample-apps/hotrod/hotrod-delete.sh index 9cc50b4d52..a7d88ebc07 100755 --- a/sample-apps/hotrod/hotrod-delete.sh +++ b/sample-apps/hotrod/hotrod-delete.sh @@ -7,7 +7,7 @@ HOTROD_NAMESPACE=${HOTROD_NAMESPACE:-"sample-application"} if [[ "${HOTROD_NAMESPACE}" == "default" || "${HOTROD_NAMESPACE}" == "kube-system" || "${HOTROD_NAMESPACE}" == "platform" ]]; then echo "Default k8s namespace and SigNoz namespace must not be deleted" echo "Deleting components only" - kubectl delete --namespace="${HOTROD_NAMESPACE}" -f <(cat hotrod-template.yaml || curl -sL https://github.com/SigNoz/signoz/raw/develop/sample-apps/hotrod/hotrod-template.yaml) + kubectl delete --namespace="${HOTROD_NAMESPACE}" -f <(cat hotrod-template.yaml || curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-template.yaml) else echo "Delete HotROD sample app namespace ${HOTROD_NAMESPACE}" kubectl delete namespace "${HOTROD_NAMESPACE}" diff --git a/sample-apps/hotrod/hotrod-install.sh b/sample-apps/hotrod/hotrod-install.sh index 42f29ede5f..b7ba4f6caa 100755 --- a/sample-apps/hotrod/hotrod-install.sh +++ b/sample-apps/hotrod/hotrod-install.sh @@ -37,7 +37,7 @@ kubectl create namespace "$HOTROD_NAMESPACE" --save-config --dry-run -o yaml 2>/ # Setup sample apps into specified namespace kubectl apply --namespace="${HOTROD_NAMESPACE}" -f <( \ - (cat hotrod-template.yaml 2>/dev/null || curl -sL https://github.com/SigNoz/signoz/raw/develop/sample-apps/hotrod/hotrod-template.yaml) | \ + (cat hotrod-template.yaml 2>/dev/null || curl -sL https://github.com/SigNoz/signoz/raw/main/sample-apps/hotrod/hotrod-template.yaml) | \ HOTROD_NAMESPACE="${HOTROD_NAMESPACE}" \ HOTROD_IMAGE="${HOTROD_IMAGE}" \ LOCUST_IMAGE="${LOCUST_IMAGE}" \