Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
dmandalidis committed Dec 21, 2024
1 parent c6d64af commit 875964b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?**:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name: CI
on:
push:
branches:
- master
- main
tags:
- 'v*'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
[Changelog pre-fork history]: https://github.com/dmandalidis/docker-client/blob/main/CHANGELOG_PREFORK.md
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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

Expand Down Expand Up @@ -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.

Expand Down

0 comments on commit 875964b

Please sign in to comment.