Skip to content

Commit 06fa182

Browse files
committed
fix: post branch rename changes
Signed-off-by: Varsha GS <[email protected]>
1 parent e72024f commit 06fa182

9 files changed

+17
-17
lines changed

.github/workflows/pr_commits_signed_off.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Find signed commits
22
on:
33
pull_request_target:
44
branches:
5-
- master # or the name of your main branch
5+
- main # or the name of your main branch
66
jobs:
77
check-sign-off:
88
name: Write comment if unsigned commits found

.github/workflows/sonarqube.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build
22
on:
33
push:
44
branches:
5-
- master # or the name of your main branch
5+
- main # or the name of your main branch
66
pull_request:
77
types: [opened, synchronize, reopened]
88
jobs:

.tekton/.currency/currency-pipelinerun.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
params:
77
- name: revision
8-
value: "master"
8+
value: "main"
99
pipelineRef:
1010
name: python-currency-pipeline
1111
serviceAccountName: currency-serviceaccount

.tekton/.currency/currency-scheduled-eventlistener.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
serviceAccountName: currency-serviceaccount
2626
params:
2727
- name: revision
28-
value: "master"
28+
value: "main"
2929
workspaces:
3030
- name: currency-pvc
3131
volumeClaimTemplate:

.tekton/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ http://localhost:8001/api/v1/namespaces/tekton-pipelines/services/tekton-dashboa
4747
1. Click `Create`
4848
2. Select the `Namespace` (where the `Pipeline` resource is created by default it is `default`)
4949
3. Select the `Pipeline` created in the `pipeline.yaml` right now it is `python-tracer-ci-pipeline`
50-
4. Fill in `Params`. The `revision` should be `master` for the `master` branch
50+
4. Fill in `Params`. The `revision` should be `main` for the `main` branch
5151
4. Select the `ServiceAccount` set to `default`
52-
5. Optionally, enter a `PipelineRun name` for example `my-master-test-pipeline`,
52+
5. Optionally, enter a `PipelineRun name` for example `my-main-test-pipeline`,
5353
but if you don't then the Dashboard will generate a unique one for you.
5454
6. As long as [the known issue with Tekton Dashboard Workspace binding](
5555
https://github.com/tektoncd/dashboard/issues/1283), is not resolved.
@@ -293,5 +293,5 @@ The current schedule is `"5 0 * * Mon-Fri`,
293293
whic means every weekday 00:05 in the pod's timezone.
294294
This can be adjusted by editing the `schedule` attribute.
295295
Currently this triggers the `github-pr-python-tracer-ci-pipeline`
296-
on the head of the `master` branch.
296+
on the head of the `main` branch.
297297
These can also be changed on demand.

.tekton/github-pr-pipeline.yaml.part

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
- unittest-default
2929
- unittest-cassandra
3030
- unittest-couchbase
31-
#- unittest-gevent-starlette
31+
- unittest-gevent-starlette
3232
taskRef:
3333
kind: Task
3434
name: github-set-status

.tekton/scheduled-eventlistener.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
spec:
2222
params:
2323
- name: revision
24-
value: master
24+
value: main
2525
- name: git-commit-sha
2626
value: $(tt.params.git-commit-sha)
2727
pipelineRef:
@@ -45,7 +45,7 @@ spec:
4545
- name: date-time-normalized
4646
value: $(extensions.normalized_date_time)
4747
- name: git-commit-sha
48-
value: $(body.git_master_head_commit_sha)
48+
value: $(body.git_main_head_commit_sha)
4949
- name: git-commit-short-sha
5050
value: $(extensions.truncated_sha)
5151
---
@@ -70,7 +70,7 @@ spec:
7070
wget -O- \
7171
--header 'Content-Type: application/json' \
7272
--post-data '{
73-
"git_master_head_commit_sha":"'"$(git ls-remote https://github.com/instana/python-sensor master | cut -f1)"'",
73+
"git_main_head_commit_sha":"'"$(git ls-remote https://github.com/instana/python-sensor main | cut -f1)"'",
7474
"date_time":"'"$(date -u -Iminutes )"'"
7575
}' \
7676
'http://el-python-tracer-scheduled-pipeline-listener.default.svc.cluster.local:8080'
@@ -92,7 +92,7 @@ spec:
9292
- name: "overlays"
9393
value:
9494
- key: truncated_sha
95-
expression: "body.git_master_head_commit_sha.truncate(7)"
95+
expression: "body.git_main_head_commit_sha.truncate(7)"
9696
- name: add-normalized-date-time
9797
ref:
9898
name: "cel"

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ The `instana` Python package collects key metrics and distributed traces for [In
44

55
Any feedback is welcome. Happy Python visibility.
66

7-
[![CircleCI](https://circleci.com/gh/instana/python-sensor/tree/master.svg?style=svg)](https://circleci.com/gh/instana/python-sensor/tree/master)
7+
[![CircleCI](https://circleci.com/gh/instana/python-sensor/tree/main.svg?style=svg)](https://circleci.com/gh/instana/python-sensor/tree/main)
88
[![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-disabled-red.svg)](http://opentracing.io)
99
[![OpenTelemetry Badge](https://img.shields.io/badge/OpenTelemetry-enabled-blue.svg)](http://opentelemetry.io)
10-
![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Finstana%2Fpython-sensor%2Frefs%2Fheads%2Fmaster%2Fpyproject.toml)
10+
![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Finstana%2Fpython-sensor%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)
1111
![GitHub Release](https://img.shields.io/github/v/release/instana/python-sensor)
1212

1313
> [!NOTE]

RELEASE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ _Note: To release a new Instana package, you must be a project member of the [In
66
Contact [Peter Giacomo Lombardo](https://github.com/pglombardo) to be added._
77

88
1. Before releasing, assure that [tests have passed](https://circleci.com/gh/instana/workflows/python-sensor) and that the package has also been manually validated in various stacks.
9-
2. `git checkout master && git pull --rebase && pip install -U twine`
10-
3. Bump the package version in `instana/version.py`. `git` commit & push the version change to the master branch
11-
4. Create a [draft Release on Github](https://github.com/instana/python-sensor/releases) using [./bin/create_general_release.py](https://github.com/instana/python-sensor/blob/master/bin/create_general_release.py)
9+
2. `git checkout main && git pull --rebase && pip install -U twine`
10+
3. Bump the package version in `instana/version.py`. `git` commit & push the version change to the `main` branch
11+
4. Create a [draft Release on Github](https://github.com/instana/python-sensor/releases) using [./bin/create_general_release.py](https://github.com/instana/python-sensor/blob/main/bin/create_general_release.py)
1212
5. Run `python setup.py sdist bdist_wheel` to create the packages file in `./dist/`
1313
6. Upload the package to Pypi with twine: `twine upload dist/instana-<version>*`
1414
7. Validate the new release on https://pypi.org/project/instana/

0 commit comments

Comments
 (0)