diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 501026b923dce..21572b039f120 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,7 +5,6 @@ on: push: branches: - main - - master merge_group: release: types: @@ -71,29 +70,19 @@ jobs: tags+=( "ghcr.io/homebrew/ubuntu${version}:${brew_version}" "ghcr.io/homebrew/ubuntu${version}:latest" - "homebrew/ubuntu${version}:${brew_version}" - "homebrew/ubuntu${version}:latest" ) if [[ "${version}" == "22.04" ]]; then tags+=( "ghcr.io/homebrew/brew:${brew_version}" "ghcr.io/homebrew/brew:latest" - "homebrew/brew:${brew_version}" - "homebrew/brew:latest" ) fi elif [[ "${GITHUB_EVENT_NAME}" == "push" && - ("${GITHUB_REF}" == "refs/heads/master" || "${GITHUB_REF}" == "refs/heads/main") && + ("${GITHUB_REF}" == "refs/heads/main") && "${version}" == "22.04" ]]; then tags+=( "ghcr.io/homebrew/brew:main" - "ghcr.io/homebrew/brew:master" "ghcr.io/homebrew/ubuntu${version}:main" - "ghcr.io/homebrew/ubuntu${version}:master" - "homebrew/brew:main" - "homebrew/brew:master" - "homebrew/ubuntu${version}:main" - "homebrew/ubuntu${version}:master" ) fi @@ -264,12 +253,6 @@ jobs: pattern: digest-${{ matrix.version }}-* merge-multiple: true - - name: Log in to Docker Hub - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 - with: - username: brewtestbot - password: ${{ secrets.HOMEBREW_BREW_DOCKER_TOKEN }} - - name: Log in to GitHub Packages (BrewTestBot) uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 with: