Skip to content

Commit 6b3c7b4

Browse files
authored
Rename main branch (#5847)
`main` is the new default branch name.
1 parent 08f75a5 commit 6b3c7b4

17 files changed

+35
-35
lines changed

.github/workflows/ci-docker-wormhole.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI-Docker-Wormhole
22

33
on:
44
pull_request: {}
5-
push: { branches: [ master ] }
5+
push: { branches: [ main ] }
66

77
permissions:
88
contents: read

.github/workflows/ci-examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI-Examples
22

33
on:
44
pull_request: {}
5-
push: { branches: [ master ] }
5+
push: { branches: [ main ] }
66

77
env:
88
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/ci-rootless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI-Docker-Rootless
22

33
on:
44
pull_request: {}
5-
push: { branches: [ master ] }
5+
push: { branches: [ main ] }
66

77
permissions:
88
contents: read

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
pull_request: {}
5-
push: { branches: [ master ] }
5+
push: { branches: [ maing ] }
66

77
permissions:
88
contents: read

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release Drafter
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
types: [opened, reopened, synchronize]
99

.github/workflows/update-docs-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v3
1919
with:
20-
ref: master
20+
ref: main
2121
- name: Update latest_version property in mkdocs.yml
2222
run: |
2323
sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Testcontainers' release process is semi-automated through GitHub Actions. This d
44

55
## Steps
66

7-
1. Ensure that the master branch is building and that tests are passing.
7+
1. Ensure that the `main` branch is building and that tests are passing.
88
1. Create a new release on GitHub. **The tag name is used as the version**, so please keep the tag name plain (e.g. 1.2.3).
99
1. The release triggers a GitHub Action workflow.
1010
1. Log in to [Sonatype](https://oss.sonatype.org/) to check the staging repository.

docs/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ For this, we are using the [gh-combine-prs](https://github.com/rnorth/gh-combine
101101
The whole process is as follow:
102102

103103
1. Check that all open Dependabot PRs did succeed their build. If they did not succeed, trigger a rerun if the cause were external factors or else document the reason if obvious.
104-
2. Run the extension from an up-to-date local `master` branch: `gh combine-prs --query "author:app/dependabot"`
104+
2. Run the extension from an up-to-date local `main` branch: `gh combine-prs --query "author:app/dependabot"`
105105
3. Merge conflicts might appear. Just ignore them, we will get those PRs in a future run.
106106
4. Once the build of the combined PR did succeed, temporarily enable merge commits and merge the PR using a merge commit through the GitHub UI.
107107
5. After the merge, disable merge commits again.

docs/examples.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
Examples of different use cases provided by Testcontainers can be found below:
44

5-
- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/kafka-cluster)
6-
- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/master/examples/linked-container)
7-
- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/master/examples/neo4j-container)
8-
- [Redis](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache)
9-
- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/master/examples/selenium-container)
10-
- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/master/examples/cucumber)
11-
- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/master/examples/singleton-container)
12-
- [Solr](https://github.com/testcontainers/testcontainers-java/tree/master/examples/solr-container)
13-
- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot)
14-
- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/master/examples/spring-boot-kotlin-redis)
15-
- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/master/examples/redis-backed-cache-testng)
5+
- [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/kafka-cluster)
6+
- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/linked-container)
7+
- [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/main/examples/neo4j-container)
8+
- [Redis](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache)
9+
- [Selenium](https://github.com/testcontainers/testcontainers-java/tree/main/examples/selenium-container)
10+
- [Selenium Module with Cucumber](https://github.com/testcontainers/testcontainers-java/tree/main/examples/cucumber)
11+
- [Singleton Container Pattern](https://github.com/testcontainers/testcontainers-java/tree/main/examples/singleton-container)
12+
- [Solr](https://github.com/testcontainers/testcontainers-java/tree/main/examples/solr-container)
13+
- [Spring Boot](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot)
14+
- [Spring Boot with Kotlin](https://github.com/testcontainers/testcontainers-java/tree/main/examples/spring-boot-kotlin-redis)
15+
- [TestNG](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache-testng)

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ A huge thank you to our sponsors:
206206

207207
## License
208208

209-
See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/LICENSE).
209+
See [LICENSE](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/LICENSE).
210210

211211
## Attributions
212212

@@ -218,4 +218,4 @@ This project was initially inspired by a [gist](https://gist.github.com/mosheesh
218218

219219
Copyright (c) 2015-2021 Richard North and other authors.
220220

221-
See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/AUTHORS) for contributors.
221+
See [AUTHORS](https://raw.githubusercontent.com/testcontainers/testcontainers-java/main/AUTHORS) for contributors.

0 commit comments

Comments
 (0)