tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #405 from docker/move-to-main 

repo: Move to main branch
This commit is contained in:
Chris Crone 2020-07-31 11:27:23 +02:00 committed by GitHub
parent a4a94e9bef c26b5ffd97
commit a46ada6c47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/master-ci.yml → .github/workflows/main-ci.yml vendored
View File

@ -3,7 +3,7 @@ name: Continuous integration
on: on:
push: push:
branches: branches:
- master - main
jobs: jobs:
build: build:

4
README.md
View File

@ -68,10 +68,10 @@ TESTIFY=TestACIRunSingleContainer AZURE_TENANT_ID="xxx" AZURE_CLIENT_ID="yyy" AZ
## Release ## Release
To create a new release: To create a new release:
* check that the CI is green on the master commit you want to release * check that the CI is green on the main branch's commit you want to release
* simply create a new tag of the form vx.y.z, following existing tags, and push the tag * simply create a new tag of the form vx.y.z, following existing tags, and push the tag
Pushing the tag will automatically create a new release and make binaries (mac, win, linux) available for download. Pushing the tag will automatically create a new release and make binaries (mac, win, linux) available for download.
Note: Linux binaries are not automatically copied to /docker/aci-integration-beta, if you want to make the linux binary publically available, you'll need to manually create a release in aci-integration-beta and upload the binary. Note: Linux binaries are not automatically copied to /docker/aci-integration-beta, if you want to make the linux binary publicly available, you'll need to manually create a release in aci-integration-beta and upload the binary.
For Desktop integration, you need to make a PR in /docker/pinata and update the cli release number [here](https://github.com/docker/pinata/blob/master/build.json#L25) For Desktop integration, you need to make a PR in /docker/pinata and update the cli release number [here](https://github.com/docker/pinata/blob/master/build.json#L25)