From 875964bdaf72eea8c13b89f421886742f5d7f190 Mon Sep 17 00:00:00 2001 From: Dimitris Mandalidis Date: Sat, 21 Dec 2024 18:11:32 +0200 Subject: [PATCH] Rename master branch to main --- .github/ISSUE_TEMPLATE.md | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codeql.yml | 4 ++-- CHANGELOG.md | 2 +- CONTRIBUTING.md | 2 +- README.md | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 180297be..983c78ed 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ If you're looking for help check [Stack Overflow](https://stackoverflow.com/questions/tagged/spotify-docker-client) and the -[user manual](https://github.com/dmandalidis/docker-client/blob/master/docs/user_manual.md). +[user manual](https://github.com/dmandalidis/docker-client/blob/main/docs/user_manual.md). --> **Is this a BUG REPORT or FEATURE REQUEST?**: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 452ba402..be5ff286 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ name: CI on: push: branches: - - master + - main tags: - 'v*' diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 827b9f12..bf488dc9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: [ "main" ] pull_request: # The branches below must be a subset of the branches above - branches: [ "master" ] + branches: [ "main" ] schedule: - cron: '42 19 * * 6' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b758cb4..3dc5f594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -505,4 +505,4 @@ and the version (otherwise it's a bug, triggering an immediate patch release) If you are interested in the history of changes when this project was managed by Spotify you can refer to [Changelog pre-fork history][] -[Changelog pre-fork history]: https://github.com/dmandalidis/docker-client/blob/master/CHANGELOG_PREFORK.md \ No newline at end of file +[Changelog pre-fork history]: https://github.com/dmandalidis/docker-client/blob/main/CHANGELOG_PREFORK.md \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b1b5b51..7f6b1b0b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,7 @@ my best. Please make sure you're using the latest version. This project is released continuously as it's developed so new releases come out almost as frequently as we -commit to master. +commit to main. ## Contributing diff --git a/README.md b/README.md index 0bdf01dd..ac321f2d 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Docker Client [![Build Status](https://github.com/dmandalidis/docker-client/actions/workflows/ci.yml/badge.svg)](https://github.com/dmandalidis/docker-client/actions/workflows/ci.yml/badge.svg) -[![codecov](https://codecov.io/github/dmandalidis/docker-client/coverage.svg?branch=master)](https://codecov.io/github/dmandalidis/docker-client?branch=master) +[![codecov](https://codecov.io/github/dmandalidis/docker-client/coverage.svg?branch=main)](https://codecov.io/github/dmandalidis/docker-client?branch=main) [![Maven Central](https://img.shields.io/maven-central/v/org.mandas/docker-client.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.mandas%22%20docker-client) [![License](https://img.shields.io/github/license/dmandalidis/docker-client.svg)](LICENSE) This is a [Docker](https://github.com/docker/docker) client written in Java. It was used in many critical production systems at Spotify until its -[fork](https://github.com/dmandalidis/docker-client/blob/master/FORK.md) on September 2019. +[fork](https://github.com/dmandalidis/docker-client/blob/main/FORK.md) on September 2019. The `docker-client` is built and tested against the latest `docker-ce` major release. @@ -17,7 +17,7 @@ The `docker-client` is built and tested against the latest `docker-ce` major rel * [Prerequisites](#prerequisites) * [Testing](#testing) * [Releasing](#releasing) -* [User Manual](https://github.com/dmandalidis/docker-client/blob/master/docs/user_manual.md) +* [User Manual](https://github.com/dmandalidis/docker-client/blob/main/docs/user_manual.md) ## Download @@ -122,7 +122,7 @@ after many test runs. You may find it helpful to occasionally issue `docker rm $ ## Releasing -Commits to the master branch will trigger our continuous integration agent to build the jar and +Commits to the main branch will trigger our continuous integration agent to build the jar and release by uploading to Sonatype. If you are a project maintainer with the necessary credentials, you can also build and release locally by running the below.