diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 528a4f3..929d100 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,9 +2,9 @@ name: ci on: push: - branches: [main] + branches: [master] pull_request: - branches: [main] + branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.vscode/settings.json b/.vscode/settings.json index 00c6cdc..534d7bb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { - "git.branchProtection": ["main"], + "git.branchProtection": ["master"], "git.branchProtectionPrompt": "alwaysCommitToNewBranch" } diff --git a/README.md b/README.md index 3bf40d2..c52c060 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Well, this dilema is very common to me, and that's why I created this shim. Although this shim can be used in many cases, some of the most common ones are: -- [devcontainers](https://containers.dev/) with [docker-outside-of-docker](https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker#readme) +- [devcontainers](https://containers.dev/) with [docker-outside-of-docker](https://github.com/devcontainers/features/tree/master/src/docker-outside-of-docker#readme) - StackOverflow: [Docker in Docker cannot mount volume](https://stackoverflow.com/questions/31381322) ## Highlights