Skip to content

Commit

Permalink
Merge branch 'master' into RandomDSdevel/manually_sort-of_rebase-with…
Browse files Browse the repository at this point in the history
…-history_commit_49aceb152

     Part of a 'manual' 'rebase with history.'
  • Loading branch information
RandomDSdevel committed Oct 20, 2021
2 parents 49aceb1 + 556b8f1 commit 034e480
Show file tree
Hide file tree
Showing 2,940 changed files with 252,845 additions and 61,201 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Library/Homebrew/vendor/portable-ruby
Library/Taps
7 changes: 6 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,15 @@ insert_final_newline = true
[{Library/Homebrew/**.rb,.simplecov}]
trim_trailing_whitespace = true

[Library/Taps/homebrew/**.rb]
[Library/Taps/**.rb]
# trailing whitespace is crucial for patches
trim_trailing_whitespace = false

[**.drawio.svg]
indent_size = unset
indent_style = unset
insert_final_newline = false

[**.md]
trim_trailing_whitespace = true
x-soft-wrap-text = true
6 changes: 1 addition & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
Please fill out one of the templates on: https://github.com/Homebrew/brew/issues/new/choose

If you want to ask a question please do so on our Discourse: https://discourse.brew.sh

We will close issues asking questions without comment.
# Please fill out one of the templates on: https://github.com/Homebrew/brew/issues/new/choose or we will close it without comment.
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/New-Feature-Suggestion.md

This file was deleted.

40 changes: 0 additions & 40 deletions .github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md

This file was deleted.

48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: New issue for Reproducible Bug
description: "If you're sure it's reproducible and not just your machine: submit an issue so we can investigate."
labels: bug
body:
- type: markdown
attributes:
value: Please note we will close your issue without comment if you do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
- type: textarea
attributes:
render: shell
label: "`brew config` output"
validations:
required: true
- type: textarea
attributes:
render: shell
label: "`brew doctor` output"
validations:
required: true
- type: checkboxes
attributes:
description: Please verify that you've followed these steps.
options:
- label: I ran `brew update` and am still able to reproduce my issue.
required: true
- label: I have resolved all warnings from `brew doctor` and that did not fix my problem.
required: true
- type: textarea
attributes:
label: What were you trying to do (and why)?
validations:
required: true
- type: textarea
attributes:
label: What happened (include all command output)?
validations:
required: true
- type: textarea
attributes:
label: What did you expect to happen?
validations:
required: true
- type: textarea
attributes:
render: shell
label: Step-by-step reproduction instructions (by running `brew` commands)
validations:
required: true
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
blank_issues_enabled: false

contact_links:
- name: Get help in GitHub Discussions
url: https://github.com/Homebrew/discussions/discussions
about: Have a question? Not sure if your issue affects everyone reproducibly? The quickest way to get help is on Homebrew's GitHub Discussions!
- name: New issue on Homebrew/homebrew-core
url: https://github.com/Homebrew/homebrew-core/issues/new/choose
about: On macOS/Mac OS X? Having a `brew` problem with a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/homebrew-core (the macOS core tap/repository).
- name: New issue on Homebrew/homebrew-cask
url: https://github.com/Homebrew/homebrew-cask/issues/new/choose
about: Having a `brew --cask` problem? Report it to Homebrew/homebrew-cask (the cask tap/repository).
- name: New issue on Homebrew/linuxbrew-core
url: https://github.com/Homebrew/linuxbrew-core/issues/new/choose
about: On Linux? Having a `brew` problem with a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/linuxbrew-core (the Linux core tap/repository).
- name: Get help from Homebrew mirror maintainers
url: https://github.com/Homebrew/discussions/discussions/1917
about: Slow download speed? Homebrew mirror not working as expected? Please take a look at the mirror list and contact respective mirror maintainers.
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: New issue for Feature Suggestion
description: Request our thoughts on your suggestion for a new feature for Homebrew.
labels: features
body:
- type: markdown
attributes:
value: Please note we will close your issue without comment if you do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
- type: textarea
attributes:
label: Provide a detailed description of the proposed feature
validations:
required: true
- type: textarea
attributes:
label: What is the motivation for the feature?
validations:
required: true
- type: textarea
attributes:
label: How will the feature be relevant to at least 90% of Homebrew users?
validations:
required: true
- type: textarea
attributes:
label: What alternatives to the feature have been considered?
validations:
required: true
- type: markdown
attributes:
value: We will close this issue or ask you to create a pull-request if it's something the maintainers are not actively planning to work on.
5 changes: 3 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
- [ ] Have you followed the guidelines in our [Contributing](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING.md) document?
- [ ] Have you followed the guidelines in our [Contributing](https://github.com/Homebrew/brew/blob/HEAD/CONTRIBUTING.md) document?
- [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/Homebrew/brew/pulls) for the same change?
- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
- [ ] Have you written new tests for your changes? [Here's an example](https://github.com/Homebrew/brew/blob/master/Library/Homebrew/test/PATH_spec.rb).
- [ ] Have you written new tests for your changes? [Here's an example](https://github.com/Homebrew/brew/blob/HEAD/Library/Homebrew/test/PATH_spec.rb).
- [ ] Have you successfully run `brew style` with your changes locally?
- [ ] Have you successfully run `brew typecheck` with your changes locally?
- [ ] Have you successfully run `brew tests` with your changes locally?

-----
9 changes: 9 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
coverage:
round: nearest
status:
project:
default:
threshold: 0.05%
patch:
default:
informational: true
27 changes: 27 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
version: 2

updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
# The actions in triage-issues.yml are updated in the Homebrew/.github repo
ignore:
- dependency-name: actions/stale
- dependency-name: dessant/lock-threads

- package-ecosystem: bundler
directory: /docs
schedule:
interval: weekly
allow:
- dependency-type: all

- package-ecosystem: bundler
directory: /Library/Homebrew
schedule:
interval: daily
allow:
- dependency-type: all
ignore:
- dependency-name: sorbet-runtime
13 changes: 0 additions & 13 deletions .github/lock.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/no-response.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
changelog:
exclude:
authors:
- dependabot
- BrewTestBot
17 changes: 0 additions & 17 deletions .github/stale.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/support.yml

This file was deleted.

66 changes: 66 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Docker
on:
push:
paths:
- .github/workflows/docker.yml
- Dockerfile
branches-ignore:
- master
release:
types:
- published
permissions:
contents: read
jobs:
ubuntu:
if: startsWith(github.repository, 'Homebrew/')
runs-on: ubuntu-latest
strategy:
matrix:
version: ["16.04", "18.04", "20.04"]
steps:
- name: Checkout
uses: actions/checkout@main
with:
fetch-depth: 0
persist-credentials: false
- name: Fetch origin/master from Git
run: git fetch origin master

- name: Build Docker image
run: docker build -t brew --build-arg=version=${{matrix.version}} .

- name: Run brew test-bot --only-setup
run: docker run --rm brew brew test-bot --only-setup

- name: Deploy the tagged Docker image to GitHub Packages
if: startsWith(github.ref, 'refs/tags/')
run: |
brew_version="${GITHUB_REF:10}"
echo "brew_version=${brew_version}" >> "${GITHUB_ENV}"
echo ${{secrets.HOMEBREW_BREW_GITHUB_PACKAGES_TOKEN}} | docker login ghcr.io -u BrewTestBot --password-stdin
docker tag brew "ghcr.io/homebrew/ubuntu${{matrix.version}}:${brew_version}"
docker push "ghcr.io/homebrew/ubuntu${{matrix.version}}:${brew_version}"
docker tag brew "ghcr.io/homebrew/ubuntu${{matrix.version}}:latest"
docker push "ghcr.io/homebrew/ubuntu${{matrix.version}}:latest"
- name: Deploy the tagged Docker image to Docker Hub
if: startsWith(github.ref, 'refs/tags/')
run: |
echo ${{secrets.HOMEBREW_BREW_DOCKER_TOKEN}} | docker login -u brewtestbot --password-stdin
docker tag brew "homebrew/ubuntu${{matrix.version}}:${brew_version}"
docker push "homebrew/ubuntu${{matrix.version}}:${brew_version}"
docker tag brew "homebrew/ubuntu${{matrix.version}}:latest"
docker push "homebrew/ubuntu${{matrix.version}}:latest"
- name: Deploy the homebrew/brew Docker image to GitHub Packages and Docker Hub
if: startsWith(github.ref, 'refs/tags/') && matrix.version == '20.04'
run: |
docker tag brew "ghcr.io/homebrew/brew:${brew_version}"
docker push "ghcr.io/homebrew/brew:${brew_version}"
docker tag brew "ghcr.io/homebrew/brew:latest"
docker push "ghcr.io/homebrew/brew:latest"
docker tag brew "homebrew/brew:${brew_version}"
docker push "homebrew/brew:${brew_version}"
docker tag brew "homebrew/brew:latest"
docker push "homebrew/brew:latest"
Loading

0 comments on commit 034e480

Please sign in to comment.