Merge branch 'master' into codecov-action

2026-10-03 22:17:01 +00:00 · 2021-03-21 14:58:03 -04:00
parent 9dff3236a7 7e2ba95169
commit ff7c05a285
595 changed files with 5658 additions and 2890 deletions
@@ -16,7 +16,7 @@ jobs:
  tests:
    strategy:
      matrix:
-        version: ['11-arm', '11.0', '10.15', '10.14']
+        version: ["11-arm", "11.0", "10.15", "10.14"]
      fail-fast: false
    runs-on: ${{ matrix.version }}
    env:
@@ -31,8 +31,6 @@ jobs:

      - run: brew style --display-cop-names

-      - run: brew man --fail-if-changed
-
      - run: brew typecheck

      - name: Run vale for docs linting
@@ -81,6 +79,58 @@ jobs:
      - name: Run brew audit --skip-style on all taps
        run: brew audit --skip-style

+      - name: Set up all Homebrew taps
+        run: |
+          HOMEBREW_REPOSITORY="$(brew --repo)"
+          HOMEBREW_CORE_REPOSITORY="$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core"
+          git -C "$HOMEBREW_CORE_REPOSITORY" remote add homebrew_core https://github.com/Homebrew/homebrew-core
+          git -C "$HOMEBREW_CORE_REPOSITORY" fetch homebrew_core || git -C "$HOMEBREW_CORE_REPOSITORY" fetch homebrew_core
+          git -C "$HOMEBREW_CORE_REPOSITORY" checkout --force -B master homebrew_core/master
+
+          brew tap homebrew/aliases
+          brew tap homebrew/bundle
+          brew tap homebrew/cask
+          brew tap homebrew/cask-drivers
+          brew tap homebrew/cask-fonts
+          brew tap homebrew/cask-versions
+          brew tap homebrew/command-not-found
+          brew tap homebrew/formula-analytics
+          brew tap homebrew/linux-dev
+          brew tap homebrew/portable-ruby
+          brew tap homebrew/services
+
+          brew update-reset Library/Taps/homebrew/homebrew-bundle
+
+          # brew style doesn't like world writable directories
+          sudo chmod -R g-w,o-w "$HOMEBREW_REPOSITORY/Library/Taps"
+
+      - name: Run brew style on homebrew-core
+        run: brew style --display-cop-names homebrew/core
+
+      - name: Run brew audit --skip-style on homebrew-core
+        run: brew audit --skip-style --tap=homebrew/core
+        env:
+          HOMEBREW_SIMULATE_MACOS_ON_LINUX: 1
+
+      - name: Run brew style on official taps
+        run: |
+          brew style --display-cop-names homebrew/bundle \
+                                         homebrew/services \
+                                         homebrew/test-bot
+
+          brew style --display-cop-names homebrew/aliases\
+                                         homebrew/command-not-found \
+                                         homebrew/formula-analytics \
+                                         homebrew/linux-dev \
+                                         homebrew/portable-ruby
+
+      - name: Run brew style on cask taps
+        run: |
+          brew style --display-cop-names homebrew/cask \
+                                         homebrew/cask-drivers \
+                                         homebrew/cask-fonts \
+                                         homebrew/cask-versions
+
  vendored-gems:
    name: vendored gems (Linux)
    runs-on: ubuntu-latest
@@ -231,29 +281,17 @@ jobs:
      - name: Run brew readall on all taps
        run: brew readall --aliases

-      - name: Run brew style on homebrew-core
-        run: brew style --display-cop-names homebrew/core
-
-      - name: Run brew style on official taps
+      - name: Run brew audit --skip-style on Cask taps
        run: |
-          brew style --display-cop-names homebrew/bundle \
-                                         homebrew/services \
-                                         homebrew/test-bot
-
-      - name: Run brew style on cask taps
-        run: |
-          brew style --display-cop-names homebrew/cask \
-                                         homebrew/cask-drivers \
-                                         homebrew/cask-fonts \
-                                         homebrew/cask-versions
-
-      - name: Run brew audit --skip-style on all taps
-        run: brew audit --skip-style
+          brew audit --skip-style --tap=homebrew/cask
+          brew audit --skip-style --tap=homebrew/cask-drivers
+          brew audit --skip-style --tap=homebrew/cask-fonts
+          brew audit --skip-style --tap=homebrew/cask-versions

      - name: Install brew tests dependencies
        run: |
          brew install subversion
-          Library/Homebrew/shims/scm/svn --homebrew=print-path
+          brew sh -c "svn --homebrew=print-path"
          which svn
          which svnadmin

@@ -19,7 +19,7 @@ jobs:
    steps:
      - name: Re-run this workflow
        if: github.event_name == 'schedule' || github.event.action == 'closed'
-        uses: reitermarkus/rerun-workflow@e2647e8885422412d5acbd61f9add5b1e77ad3ab
+        uses: reitermarkus/rerun-workflow@64cba9e834916060e77b7dad424d086837fdd0a6
        with:
          token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
          continuous-label: waiting for feedback
@@ -0,0 +1,82 @@
+name: Update maintainers, manpage and completions
+
+on:
+  push:
+    paths:
+      - .github/workflows/update-manpage.yml
+      - README.md
+      - Library/Homebrew/cmd/**
+      - Library/Homebrew/dev-cmd/**
+      - Library/Homebrew/completions/**
+      - Library/Homebrew/manpages/**
+      - Library/Homebrew/cli/parser.rb
+      - Library/Homebrew/completions.rb
+      - Library/Homebrew/env_config.rb
+    branches:
+      - master
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  update-manpage:
+    runs-on: ubuntu-latest
+    if: github.repository == 'Homebrew/brew'
+    steps:
+      - name: Setup Homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+
+      - name: Configure Git user
+        uses: Homebrew/actions/git-user-config@master
+        with:
+          username: BrewTestBot
+
+      - name: Update maintainers, manpage and completions
+        id: update
+        run: |
+          git fetch origin
+
+          BRANCH=update-manpage
+          echo "::set-output name=branch::${BRANCH}"
+
+          if git ls-remote --exit-code --heads origin "$BRANCH"; then
+            git checkout "$BRANCH"
+            git reset --hard origin/master
+          else
+            git checkout -B "$BRANCH" origin/master
+            BRANCH_EXISTS="1"
+          fi
+
+          if [ "${{github.event_name}}" != "push" ]; then
+            brew update-maintainers
+          fi
+
+          if brew man --fail-if-not-changed; then
+            git add "$GITHUB_WORKSPACE/README.md" \
+                    "$GITHUB_WORKSPACE/docs/Manpage.md" \
+                    "$GITHUB_WORKSPACE/manpages/brew.1" \
+                    "$GITHUB_WORKSPACE/completions"
+            git commit -m "Update maintainers, manpage and completions." \
+                       -m "Autogenerated by the [update-manpage](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/update-manpage.yml) workflow."
+            echo "::set-output name=committed::true"
+            if [ -n "$BRANCH_EXISTS" ]; then
+              echo "::set-output name=pull_request::true"
+            fi
+          fi
+        env:
+          HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
+
+      - name: Push commits
+        if: steps.update.outputs.committed == 'true'
+        uses: Homebrew/actions/git-try-push@master
+        with:
+          token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
+          branch: ${{ steps.update.outputs.branch }}
+          force: true
+          origin_branch: "master"
+
+      - name: Open a pull request
+        if: steps.update.outputs.pull_request == 'true'
+        run: hub pull-request --no-edit
+        env:
+          GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}