Skip to content

Commit

Permalink
Merge pull request #8727 from camunda-cloud/backport-8720-to-stable/1.3
Browse files Browse the repository at this point in the history
[Backport stable/1.3] Remove references of the master branch
  • Loading branch information
npepinpe authored Feb 3, 2022
2 parents 9d70809 + 37e3bf0 commit 9f34b80
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .ci/scripts/distribution/analyse-java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ else
PROPERTIES+=("-Dsonar.branch.name=${GIT_BRANCH}")
fi

if [ "${GIT_BRANCH}" == "master" ] || [ "${GIT_BRANCH}" == "develop" ]; then
if [ "${GIT_BRANCH}" == "develop" ]; then
TARGET_BRANCH="${GIT_BRANCH}"
else
TARGET_BRANCH="develop"
Expand Down
4 changes: 2 additions & 2 deletions .ci/seed.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def seedJob = job('seed-job-zeebe') {
}
branch 'develop'
extensions {
localBranch 'master'
localBranch 'develop'
pathRestriction {
includedRegions(dslScriptPathToMonitor)
excludedRegions('')
Expand All @@ -37,7 +37,7 @@ def seedJob = job('seed-job-zeebe') {
}
}

label 'master'
label 'develop'
jdk '(Default)'

steps {
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
tags:
- v*
branches:
- master
- develop
pull_request:
jobs:
Expand Down
7 changes: 2 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,8 @@ describes:

## Starting on an issue

Zeebe follows a
[gitflow](https://nvie.com/posts/a-successful-git-branching-model/) process.
The `develop` branch contains the current in-development state of the project. The `master` branch contains the latest stable release.

To work on an issue, follow the following steps:
The `develop` branch contains the current in-development state of the project. To work on an issue,
follow the following steps:

1. Check that a [GitHub issue][issues] exists for the task you want to work on.
If one does not, create one. Refer to the [issue guidelines](#github-issue-guidelines).
Expand Down
4 changes: 1 addition & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
// https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
def buildName = "${env.JOB_BASE_NAME.replaceAll("%2F", "-").replaceAll("\\.", "-").take(20)}-${env.BUILD_ID}"

def masterBranchName = 'master'
def isMasterBranch = env.BRANCH_NAME == masterBranchName
def developBranchName = 'develop'
def isDevelopBranch = env.BRANCH_NAME == developBranchName
def latestStableBranchName = 'stable/1.1'
Expand Down Expand Up @@ -414,7 +412,7 @@ pipeline {
build job: 'zeebe-docker', parameters: [
string(name: 'BRANCH', value: env.BRANCH_NAME),
string(name: 'VERSION', value: env.VERSION),
booleanParam(name: 'IS_LATEST', value: isMasterBranch),
booleanParam(name: 'IS_LATEST', value: false),
booleanParam(name: 'PUSH', value: isDevelopBranch)
]
}
Expand Down
2 changes: 1 addition & 1 deletion licenses/Clarification-on-gRPC-code-generation.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Clarification on gRPC Code Generation

The Zeebe Gateway Protocol (API) as published https://github.com/zeebe-io/zeebe/blob/master/gateway-protocol/src/main/proto/gateway.proto
The Zeebe Gateway Protocol (API) as published https://github.com/zeebe-io/zeebe/blob/develop/gateway-protocol/src/main/proto/gateway.proto
is licensed under the Zeebe Community License 1.1. Using gRPC tooling to
generate stubs for the protocol does not constitute creating a derivative work
under the Zeebe Community License 1.1 and no licensing restrictions are imposed
Expand Down

0 comments on commit 9f34b80

Please sign in to comment.