From d661cffc1f78fdccb2d740bffd88a3eb854b8ed6 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 24 Jun 2025 11:14:57 +0100 Subject: [PATCH] Switch to using `main` as the default branch Homebrew/brew has moved to a `main` default branch so we can more move references from `master` to `main`. --- .devcontainer/devcontainer.json | 2 +- .github/workflows/tests.yml | 6 +- Library/Homebrew/brew.sh | 4 +- Library/Homebrew/cmd/developer.rb | 4 +- .../Homebrew/data/spdx/spdx_exceptions.json | 44 ++-- Library/Homebrew/data/spdx/spdx_licenses.json | 220 +++++++++--------- Library/Homebrew/dev-cmd/tests.rb | 6 +- Library/Homebrew/dev-cmd/update-test.rb | 20 +- Library/Homebrew/download_queue.rb | 2 +- Library/Homebrew/formula_auditor.rb | 4 +- Library/Homebrew/github_runner_matrix.rb | 2 +- .../Homebrew/rubocops/shared/url_helper.rb | 4 +- .../sorbet/tapioca/compilers/rubocop.rb | 4 +- .../Homebrew/test/linux_runner_spec_spec.rb | 2 +- Library/Homebrew/test/rubocops/urls_spec.rb | 2 +- README.md | 2 +- completions/fish/brew.fish | 2 +- completions/zsh/_brew | 2 +- docs/Acceptable-Formulae.md | 2 +- docs/Adding-Software-to-Homebrew.md | 8 +- docs/Brew-Bundle-and-Brewfile.md | 4 +- docs/Common-Issues-for-Core-Contributors.md | 2 +- docs/Common-Issues.md | 4 +- docs/Formula-Cookbook.md | 18 +- docs/Homebrew-Leadership-Responsibilities.md | 4 +- docs/Homebrew-brew-Maintainer-Guide.md | 2 +- ...Homebrew-homebrew-cask-Maintainer-Guide.md | 2 +- docs/How-To-Open-a-Homebrew-Pull-Request.md | 4 +- docs/Installation.md | 2 +- docs/Manpage.md | 6 +- docs/New-Maintainer-Checklist.md | 2 +- docs/Node-for-Formula-Authors.md | 2 +- docs/README.md | 2 +- docs/Releases.md | 6 +- docs/Typechecking.md | 4 +- .../2019-moss-track-iii-grant-nomination.md | 2 +- manpages/brew.1 | 6 +- 37 files changed, 206 insertions(+), 208 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6524ff2817..990dabc1d9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // For format details, see https://aka.ms/devcontainer.json. { "name": "Homebrew/brew", - "image": "ghcr.io/homebrew/brew:master", + "image": "ghcr.io/homebrew/brew:main", "workspaceFolder": "/home/linuxbrew/.linuxbrew/Homebrew", "workspaceMount": "source=${localWorkspaceFolder},target=/home/linuxbrew/.linuxbrew/Homebrew,type=bind,consistency=cached", "onCreateCommand": ".devcontainer/on-create-command.sh", diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6d1b05acec..cf93770ffb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -136,8 +136,7 @@ jobs: if: github.repository_owner == 'Homebrew' && github.event_name != 'push' runs-on: ubuntu-latest container: - # TODO: switch to main when we're pushing those images - image: ghcr.io/homebrew/brew:master + image: ghcr.io/homebrew/brew:main steps: - name: Set up Homebrew id: set-up-homebrew @@ -357,8 +356,7 @@ jobs: container: ghcr.io/homebrew/ubuntu24.04:latest - name: test-bot (Linux x86_64) runs-on: ubuntu-latest - # TODO: switch to main when we've migrated to it - container: ghcr.io/homebrew/ubuntu22.04:master + container: ghcr.io/homebrew/ubuntu22.04:main # Use Debian Old Stable for testing Homebrew's glibc support. - name: test-bot (Linux Homebrew glibc) runs-on: ubuntu-latest diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 3557d8a40b..56f2a5d58a 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -531,9 +531,9 @@ GIT_REVISION=$("${HOMEBREW_GIT}" -C "${HOMEBREW_REPOSITORY}" rev-parse HEAD 2>/d if [[ -z "${GIT_REVISION}" ]] then read -r GIT_HEAD 2>/dev/null <"${HOMEBREW_REPOSITORY}/.git/HEAD" - if [[ "${GIT_HEAD}" == "ref: refs/heads/master" ]] + if [[ "${GIT_HEAD}" == "ref: refs/heads/main" ]] then - read -r GIT_REVISION 2>/dev/null <"${HOMEBREW_REPOSITORY}/.git/refs/heads/master" + read -r GIT_REVISION 2>/dev/null <"${HOMEBREW_REPOSITORY}/.git/refs/heads/main" elif [[ "${GIT_HEAD}" == "ref: refs/heads/stable" ]] then read -r GIT_REVISION 2>/dev/null <"${HOMEBREW_REPOSITORY}/.git/refs/heads/stable" diff --git a/Library/Homebrew/cmd/developer.rb b/Library/Homebrew/cmd/developer.rb index 0c4feb5134..6442bfb1ef 100644 --- a/Library/Homebrew/cmd/developer.rb +++ b/Library/Homebrew/cmd/developer.rb @@ -9,7 +9,7 @@ module Homebrew cmd_args do description <<~EOS Control Homebrew's developer mode. When developer mode is enabled, - `brew update` will update Homebrew to the latest commit on the `master` + `brew update` will update Homebrew to the latest commit on the `main` branch instead of the latest stable version along with some other behaviour changes. `brew developer` [`state`]: @@ -38,7 +38,7 @@ module Homebrew puts "However, `brew update` will update to the latest stable tag because " \ "#{Tty.bold}HOMEBREW_UPDATE_TO_TAG#{Tty.reset} is set." else - puts "`brew update` will update to the latest commit on the `master` branch." + puts "`brew update` will update to the latest commit on the `main` branch." end else puts "`brew update` will update to the latest stable tag." diff --git a/Library/Homebrew/data/spdx/spdx_exceptions.json b/Library/Homebrew/data/spdx/spdx_exceptions.json index b6178f6ef9..85428662cf 100644 --- a/Library/Homebrew/data/spdx/spdx_exceptions.json +++ b/Library/Homebrew/data/spdx/spdx_exceptions.json @@ -105,7 +105,7 @@ "name": "Bison exception 1.24", "licenseExceptionId": "Bison-exception-1.24", "seeAlso": [ - "https://github.com/arineng/rwhoisd/blob/master/rwhoisd/mkdb/y.tab.c#L180" + "https://github.com/arineng/rwhoisd/blob/HEAD/rwhoisd/mkdb/y.tab.c#L180" ] }, { @@ -245,7 +245,7 @@ "name": "fmt exception", "licenseExceptionId": "fmt-exception", "seeAlso": [ - "https://github.com/fmtlib/fmt/blob/master/LICENSE", + "https://github.com/fmtlib/fmt/blob/HEAD/LICENSE", "https://github.com/fmtlib/fmt/blob/2eb363297b24cd71a68ccfb20ff755430f17e60f/LICENSE#L22C1-L27C62" ] }, @@ -324,7 +324,7 @@ "name": "GNAT exception", "licenseExceptionId": "GNAT-exception", "seeAlso": [ - "https://github.com/AdaCore/florist/blob/master/libsrc/posix-configurable_file_limits.adb" + "https://github.com/AdaCore/florist/blob/HEAD/libsrc/posix-configurable_file_limits.adb" ] }, { @@ -335,7 +335,7 @@ "name": "GNOME examples exception", "licenseExceptionId": "GNOME-examples-exception", "seeAlso": [ - "https://gitlab.gnome.org/Archive/gnome-devel-docs/-/blob/master/platform-demos/C/legal.xml?ref_type\u003dheads", + "https://gitlab.gnome.org/Archive/gnome-devel-docs/-/blob/HEAD/platform-demos/C/legal.xml?ref_type\u003dheads", "http://meldmerge.org/help/" ] }, @@ -401,7 +401,7 @@ "licenseExceptionId": "GPL-3.0-linking-source-exception", "seeAlso": [ "https://www.gnu.org/licenses/gpl-faq.en.html#GPLIncompatibleLibs", - "https://github.com/mirror/wget/blob/master/src/http.c#L20" + "https://github.com/mirror/wget/blob/HEAD/src/http.c#L20" ] }, { @@ -412,7 +412,7 @@ "name": "GPL Cooperation Commitment 1.0", "licenseExceptionId": "GPL-CC-1.0", "seeAlso": [ - "https://github.com/gplcc/gplcc/blob/master/Project/COMMITMENT", + "https://github.com/gplcc/gplcc/blob/HEAD/Project/COMMITMENT", "https://gplcc.github.io/gplcc/Project/README-PROJECT.html" ] }, @@ -446,7 +446,7 @@ "name": "harbour exception", "licenseExceptionId": "harbour-exception", "seeAlso": [ - "https://github.com/harbour/core/blob/master/LICENSE.txt#L44-L66" + "https://github.com/harbour/core/blob/HEAD/LICENSE.txt#L44-L66" ] }, { @@ -491,8 +491,8 @@ "licenseExceptionId": "LGPL-3.0-linking-exception", "seeAlso": [ "https://raw.githubusercontent.com/go-xmlpath/xmlpath/v2/LICENSE", - "https://github.com/goamz/goamz/blob/master/LICENSE", - "https://github.com/juju/errors/blob/master/LICENSE" + "https://github.com/goamz/goamz/blob/HEAD/LICENSE", + "https://github.com/juju/errors/blob/HEAD/LICENSE" ] }, { @@ -583,8 +583,8 @@ "name": "mxml Exception", "licenseExceptionId": "mxml-exception", "seeAlso": [ - "https://github.com/michaelrsweet/mxml/blob/master/NOTICE", - "https://github.com/michaelrsweet/mxml/blob/master/LICENSE" + "https://github.com/michaelrsweet/mxml/blob/HEAD/NOTICE", + "https://github.com/michaelrsweet/mxml/blob/HEAD/LICENSE" ] }, { @@ -673,8 +673,8 @@ "name": "INRIA QPL 1.0 2004 variant exception", "licenseExceptionId": "QPL-1.0-INRIA-2004-exception", "seeAlso": [ - "https://git.frama-c.com/pub/frama-c/-/blob/master/licenses/Q_MODIFIED_LICENSE", - "https://github.com/maranget/hevea/blob/master/LICENSE" + "https://git.frama-c.com/pub/frama-c/-/blob/HEAD/licenses/Q_MODIFIED_LICENSE", + "https://github.com/maranget/hevea/blob/HEAD/LICENSE" ] }, { @@ -734,7 +734,7 @@ "name": "RRDtool FLOSS exception 2.0", "licenseExceptionId": "RRDtool-FLOSS-exception-2.0", "seeAlso": [ - "https://github.com/oetiker/rrdtool-1.x/blob/master/COPYRIGHT#L25-L90", + "https://github.com/oetiker/rrdtool-1.x/blob/HEAD/COPYRIGHT#L25-L90", "https://oss.oetiker.ch/rrdtool/license.en.html" ] }, @@ -746,9 +746,9 @@ "name": "SANE Exception", "licenseExceptionId": "SANE-exception", "seeAlso": [ - "https://github.com/alexpevzner/sane-airscan/blob/master/LICENSE", - "https://gitlab.com/sane-project/backends/-/blob/master/sanei/sanei_pp.c?ref_type\u003dheads", - "https://gitlab.com/sane-project/frontends/-/blob/master/sanei/sanei_codec_ascii.c?ref_type\u003dheads" + "https://github.com/alexpevzner/sane-airscan/blob/HEAD/LICENSE", + "https://gitlab.com/sane-project/backends/-/blob/HEAD/sanei/sanei_pp.c?ref_type\u003dheads", + "https://gitlab.com/sane-project/frontends/-/blob/HEAD/sanei/sanei_codec_ascii.c?ref_type\u003dheads" ] }, { @@ -781,7 +781,7 @@ "name": "stunnel Exception", "licenseExceptionId": "stunnel-exception", "seeAlso": [ - "https://github.com/mtrojnar/stunnel/blob/master/COPYING.md" + "https://github.com/mtrojnar/stunnel/blob/HEAD/COPYING.md" ] }, { @@ -837,7 +837,7 @@ "name": "Unmodified Binary Distribution exception", "licenseExceptionId": "UBDL-exception", "seeAlso": [ - "https://github.com/ipxe/ipxe/blob/master/COPYING.UBDL" + "https://github.com/ipxe/ipxe/blob/HEAD/COPYING.UBDL" ] }, { @@ -861,7 +861,7 @@ "seeAlso": [ "https://git.stg.centos.org/source-git/vsftpd/blob/f727873674d9c9cd7afcae6677aa782eb54c8362/f/LICENSE", "https://launchpad.net/debian/squeeze/+source/vsftpd/+copyright", - "https://github.com/richardcochran/vsftpd/blob/master/COPYING" + "https://github.com/richardcochran/vsftpd/blob/HEAD/COPYING" ] }, { @@ -883,9 +883,9 @@ "name": "x11vnc OpenSSL Exception", "licenseExceptionId": "x11vnc-openssl-exception", "seeAlso": [ - "https://github.com/LibVNC/x11vnc/blob/master/src/8to24.c#L22" + "https://github.com/LibVNC/x11vnc/blob/HEAD/src/8to24.c#L22" ] } ], "releaseDate": "2024-12-30T00:00:00Z" -} \ No newline at end of file +} diff --git a/Library/Homebrew/data/spdx/spdx_licenses.json b/Library/Homebrew/data/spdx/spdx_licenses.json index 541444700e..04ce631e79 100644 --- a/Library/Homebrew/data/spdx/spdx_licenses.json +++ b/Library/Homebrew/data/spdx/spdx_licenses.json @@ -59,9 +59,9 @@ "name": "AdaCore Doc License", "licenseId": "AdaCore-doc", "seeAlso": [ - "https://github.com/AdaCore/xmlada/blob/master/docs/index.rst", - "https://github.com/AdaCore/gnatcoll-core/blob/master/docs/index.rst", - "https://github.com/AdaCore/gnatcoll-db/blob/master/docs/index.rst" + "https://github.com/AdaCore/xmlada/blob/HEAD/docs/index.rst", + "https://github.com/AdaCore/gnatcoll-core/blob/HEAD/docs/index.rst", + "https://github.com/AdaCore/gnatcoll-db/blob/HEAD/docs/index.rst" ], "isOsiApproved": false }, @@ -85,7 +85,7 @@ "name": "Adobe Display PostScript License", "licenseId": "Adobe-Display-PostScript", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/COPYING?ref_type\u003dheads#L752" + "https://gitlab.freedesktop.org/xorg/xserver/-/blob/HEAD/COPYING?ref_type\u003dheads#L752" ], "isOsiApproved": false }, @@ -109,7 +109,7 @@ "name": "Adobe Utopia Font License", "licenseId": "Adobe-Utopia", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi/-/blob/master/COPYING?ref_type\u003dheads" + "https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi/-/blob/HEAD/COPYING?ref_type\u003dheads" ], "isOsiApproved": false }, @@ -667,7 +667,7 @@ "name": "bcrypt Solar Designer License", "licenseId": "bcrypt-Solar-Designer", "seeAlso": [ - "https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/ext/mri/crypt_blowfish.c" + "https://github.com/bcrypt-ruby/bcrypt-ruby/blob/HEAD/ext/mri/crypt_blowfish.c" ], "isOsiApproved": false }, @@ -769,8 +769,8 @@ "licenseId": "Boehm-GC", "seeAlso": [ "https://fedoraproject.org/wiki/Licensing:MIT#Another_Minimal_variant_(found_in_libatomic_ops)", - "https://github.com/uim/libgcroots/blob/master/COPYING", - "https://github.com/ivmai/libatomic_ops/blob/master/LICENSE" + "https://github.com/uim/libgcroots/blob/HEAD/COPYING", + "https://github.com/ivmai/libatomic_ops/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -819,7 +819,7 @@ "name": "Brian Gladman 3-Clause License", "licenseId": "Brian-Gladman-3-Clause", "seeAlso": [ - "https://github.com/SWI-Prolog/packages-clib/blob/master/sha1/brg_endian.h" + "https://github.com/SWI-Prolog/packages-clib/blob/HEAD/sha1/brg_endian.h" ], "isOsiApproved": false }, @@ -856,7 +856,7 @@ "name": "BSD 2-Clause - Ian Darwin variant", "licenseId": "BSD-2-Clause-Darwin", "seeAlso": [ - "https://github.com/file/file/blob/master/COPYING" + "https://github.com/file/file/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -921,7 +921,7 @@ "seeAlso": [ "http://www.freebsd.org/copyright/freebsd-license.html", "https://people.freebsd.org/~ivoras/wine/patch-wine-nvidia.sh", - "https://github.com/protegeproject/protege/blob/master/license.txt" + "https://github.com/protegeproject/protege/blob/HEAD/license.txt" ], "isOsiApproved": false }, @@ -947,7 +947,7 @@ "name": "BSD 3-Clause acpica variant", "licenseId": "BSD-3-Clause-acpica", "seeAlso": [ - "https://github.com/acpica/acpica/blob/master/source/common/acfileio.c#L119" + "https://github.com/acpica/acpica/blob/HEAD/source/common/acfileio.c#L119" ], "isOsiApproved": false }, @@ -984,7 +984,7 @@ "name": "BSD 3-Clause Flex variant", "licenseId": "BSD-3-Clause-flex", "seeAlso": [ - "https://github.com/westes/flex/blob/master/COPYING" + "https://github.com/westes/flex/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -996,7 +996,7 @@ "name": "Hewlett-Packard BSD variant license", "licenseId": "BSD-3-Clause-HP", "seeAlso": [ - "https://github.com/zdohnal/hplip/blob/master/COPYING#L939" + "https://github.com/zdohnal/hplip/blob/HEAD/COPYING#L939" ], "isOsiApproved": false }, @@ -1032,8 +1032,8 @@ "name": "BSD 3-Clause No Military License", "licenseId": "BSD-3-Clause-No-Military-License", "seeAlso": [ - "https://gitlab.syncad.com/hive/dhive/-/blob/master/LICENSE", - "https://github.com/greymass/swift-eosio/blob/master/LICENSE" + "https://gitlab.syncad.com/hive/dhive/-/blob/HEAD/LICENSE", + "https://github.com/greymass/swift-eosio/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -1144,7 +1144,7 @@ "licenseId": "BSD-4.3RENO", "seeAlso": [ "https://sourceware.org/git/?p\u003dbinutils-gdb.git;a\u003dblob;f\u003dlibiberty/strcasecmp.c;h\u003d131d81c2ce7881fa48c363dc5bf5fb302c61ce0b;hb\u003dHEAD", - "https://git.openldap.org/openldap/openldap/-/blob/master/COPYRIGHT#L55-63" + "https://git.openldap.org/openldap/openldap/-/blob/HEAD/COPYRIGHT#L55-63" ], "isOsiApproved": false }, @@ -1169,7 +1169,7 @@ "name": "BSD Advertising Acknowledgement License", "licenseId": "BSD-Advertising-Acknowledgement", "seeAlso": [ - "https://github.com/python-excel/xlrd/blob/master/LICENSE#L33" + "https://github.com/python-excel/xlrd/blob/HEAD/LICENSE#L33" ], "isOsiApproved": false }, @@ -1181,7 +1181,7 @@ "name": "BSD with Attribution and HPND disclaimer", "licenseId": "BSD-Attribution-HPND-disclaimer", "seeAlso": [ - "https://github.com/cyrusimap/cyrus-sasl/blob/master/COPYING" + "https://github.com/cyrusimap/cyrus-sasl/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -1217,7 +1217,7 @@ "name": "BSD Source Code Attribution - beginning of file variant", "licenseId": "BSD-Source-beginning-file", "seeAlso": [ - "https://github.com/lattera/freebsd/blob/master/sys/cam/cam.c#L4" + "https://github.com/lattera/freebsd/blob/HEAD/sys/cam/cam.c#L4" ], "isOsiApproved": false }, @@ -1229,7 +1229,7 @@ "name": "BSD Source Code Attribution", "licenseId": "BSD-Source-Code", "seeAlso": [ - "https://github.com/robbiehanson/CocoaHTTPServer/blob/master/LICENSE.txt" + "https://github.com/robbiehanson/CocoaHTTPServer/blob/HEAD/LICENSE.txt" ], "isOsiApproved": false }, @@ -1318,7 +1318,7 @@ "name": "Computational Use of Data Agreement v1.0", "licenseId": "C-UDA-1.0", "seeAlso": [ - "https://github.com/microsoft/Computational-Use-of-Data-Agreement/blob/master/C-UDA-1.0.md", + "https://github.com/microsoft/Computational-Use-of-Data-Agreement/blob/HEAD/C-UDA-1.0.md", "https://cdla.dev/computational-use-of-data-agreement-v1-0/" ], "isOsiApproved": false @@ -2315,7 +2315,7 @@ "name": "Checkmk License", "licenseId": "checkmk", "seeAlso": [ - "https://github.com/libcheck/check/blob/master/checkmk/checkmk.in" + "https://github.com/libcheck/check/blob/HEAD/checkmk/checkmk.in" ], "isOsiApproved": false }, @@ -2341,7 +2341,7 @@ "name": "Clips License", "licenseId": "Clips", "seeAlso": [ - "https://github.com/DrItanium/maya/blob/master/LICENSE.CLIPS" + "https://github.com/DrItanium/maya/blob/HEAD/LICENSE.CLIPS" ], "isOsiApproved": false }, @@ -2426,7 +2426,7 @@ "name": "Community Specification License 1.0", "licenseId": "Community-Spec-1.0", "seeAlso": [ - "https://github.com/CommunitySpecification/1.0/blob/master/1._Community_Specification_License-v1.md" + "https://github.com/CommunitySpecification/1.0/blob/HEAD/1._Community_Specification_License-v1.md" ], "isOsiApproved": false }, @@ -2452,7 +2452,7 @@ "name": "copyleft-next 0.3.0", "licenseId": "copyleft-next-0.3.0", "seeAlso": [ - "https://github.com/copyleft-next/copyleft-next/blob/master/Releases/copyleft-next-0.3.0" + "https://github.com/copyleft-next/copyleft-next/blob/HEAD/Releases/copyleft-next-0.3.0" ], "isOsiApproved": false }, @@ -2464,7 +2464,7 @@ "name": "copyleft-next 0.3.1", "licenseId": "copyleft-next-0.3.1", "seeAlso": [ - "https://github.com/copyleft-next/copyleft-next/blob/master/Releases/copyleft-next-0.3.1" + "https://github.com/copyleft-next/copyleft-next/blob/HEAD/Releases/copyleft-next-0.3.1" ], "isOsiApproved": false }, @@ -2478,7 +2478,7 @@ "seeAlso": [ "https://android.googlesource.com/platform/external/dng_sdk/+/refs/heads/master/source/dng_lossless_jpeg.cpp#16", "https://www.mssl.ucl.ac.uk/~mcrw/src/20050920/proto.h", - "https://gitlab.freedesktop.org/libopenraw/libopenraw/blob/master/lib/ljpegdecompressor.cpp#L32" + "https://gitlab.freedesktop.org/libopenraw/libopenraw/blob/HEAD/lib/ljpegdecompressor.cpp#L32" ], "isOsiApproved": false }, @@ -2529,10 +2529,10 @@ "name": "Cronyx License", "licenseId": "Cronyx", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/font/alias/-/blob/master/COPYING", - "https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic/-/blob/master/COPYING", - "https://gitlab.freedesktop.org/xorg/font/misc-cyrillic/-/blob/master/COPYING", - "https://gitlab.freedesktop.org/xorg/font/screen-cyrillic/-/blob/master/COPYING" + "https://gitlab.freedesktop.org/xorg/font/alias/-/blob/HEAD/COPYING", + "https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic/-/blob/HEAD/COPYING", + "https://gitlab.freedesktop.org/xorg/font/misc-cyrillic/-/blob/HEAD/COPYING", + "https://gitlab.freedesktop.org/xorg/font/screen-cyrillic/-/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -2592,7 +2592,7 @@ "name": "curl License", "licenseId": "curl", "seeAlso": [ - "https://github.com/bagder/curl/blob/master/COPYING" + "https://github.com/bagder/curl/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -2635,7 +2635,7 @@ "name": "DEC 3-Clause License", "licenseId": "DEC-3-Clause", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/COPYING?ref_type\u003dheads#L239" + "https://gitlab.freedesktop.org/xorg/xserver/-/blob/HEAD/COPYING?ref_type\u003dheads#L239" ], "isOsiApproved": false }, @@ -2744,7 +2744,7 @@ "name": "Detection Rule License 1.0", "licenseId": "DRL-1.0", "seeAlso": [ - "https://github.com/Neo23x0/sigma/blob/master/LICENSE.Detection.Rules.md" + "https://github.com/Neo23x0/sigma/blob/HEAD/LICENSE.Detection.Rules.md" ], "isOsiApproved": false }, @@ -2780,7 +2780,7 @@ "name": "David M. Gay dtoa License", "licenseId": "dtoa", "seeAlso": [ - "https://github.com/SWI-Prolog/swipl-devel/blob/master/src/os/dtoa.c", + "https://github.com/SWI-Prolog/swipl-devel/blob/HEAD/src/os/dtoa.c", "https://sourceware.org/git/?p\u003dnewlib-cygwin.git;a\u003dblob;f\u003dnewlib/libc/stdlib/mprec.h;hb\u003dHEAD" ], "isOsiApproved": false @@ -2884,7 +2884,7 @@ "licenseId": "Elastic-2.0", "seeAlso": [ "https://www.elastic.co/licensing/elastic-license", - "https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE-2.0.txt" + "https://github.com/elastic/elasticsearch/blob/HEAD/licenses/ELASTIC-LICENSE-2.0.txt" ], "isOsiApproved": false }, @@ -2960,7 +2960,7 @@ "name": "Etalab Open License 2.0", "licenseId": "etalab-2.0", "seeAlso": [ - "https://github.com/DISIC/politique-de-contribution-open-source/blob/master/LICENSE.pdf", + "https://github.com/DISIC/politique-de-contribution-open-source/blob/HEAD/LICENSE.pdf", "https://raw.githubusercontent.com/DISIC/politique-de-contribution-open-source/master/LICENSE" ], "isOsiApproved": false @@ -3207,7 +3207,7 @@ "name": "Furuseth License", "licenseId": "Furuseth", "seeAlso": [ - "https://git.openldap.org/openldap/openldap/-/blob/master/COPYRIGHT?ref_type\u003dheads#L39-51" + "https://git.openldap.org/openldap/openldap/-/blob/HEAD/COPYRIGHT?ref_type\u003dheads#L39-51" ], "isOsiApproved": false }, @@ -3231,7 +3231,7 @@ "name": "Gnome GCR Documentation License", "licenseId": "GCR-docs", "seeAlso": [ - "https://github.com/GNOME/gcr/blob/master/docs/COPYING" + "https://github.com/GNOME/gcr/blob/HEAD/docs/COPYING" ], "isOsiApproved": false }, @@ -3255,7 +3255,7 @@ "name": "Generic XTS License", "licenseId": "generic-xts", "seeAlso": [ - "https://github.com/mhogomchungu/zuluCrypt/blob/master/external_libraries/tcplay/generic_xts.c" + "https://github.com/mhogomchungu/zuluCrypt/blob/HEAD/external_libraries/tcplay/generic_xts.c" ], "isOsiApproved": false }, @@ -3846,7 +3846,7 @@ "name": "Graphics Gems License", "licenseId": "Graphics-Gems", "seeAlso": [ - "https://github.com/erich666/GraphicsGems/blob/master/LICENSE.md" + "https://github.com/erich666/GraphicsGems/blob/HEAD/LICENSE.md" ], "isOsiApproved": false }, @@ -3871,7 +3871,7 @@ "licenseId": "gtkbook", "seeAlso": [ "https://github.com/slogan621/gtkbook", - "https://github.com/oetiker/rrdtool-1.x/blob/master/src/plbasename.c#L8-L11" + "https://github.com/oetiker/rrdtool-1.x/blob/HEAD/src/plbasename.c#L8-L11" ], "isOsiApproved": false }, @@ -3919,7 +3919,7 @@ "name": "HIDAPI License", "licenseId": "HIDAPI", "seeAlso": [ - "https://github.com/signal11/hidapi/blob/master/LICENSE-orig.txt" + "https://github.com/signal11/hidapi/blob/HEAD/LICENSE-orig.txt" ], "isOsiApproved": false }, @@ -3956,7 +3956,7 @@ "name": "Hewlett-Packard 1989 License", "licenseId": "HP-1989", "seeAlso": [ - "https://github.com/bleargh45/Data-UUID/blob/master/LICENSE" + "https://github.com/bleargh45/Data-UUID/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -3982,7 +3982,7 @@ "name": "Historical Permission Notice and Disclaimer - DEC variant", "licenseId": "HPND-DEC", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/blob/master/COPYING?ref_type\u003dheads#L69" + "https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/blob/HEAD/COPYING?ref_type\u003dheads#L69" ], "isOsiApproved": false }, @@ -3994,8 +3994,8 @@ "name": "Historical Permission Notice and Disclaimer - documentation variant", "licenseId": "HPND-doc", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/lib/libxext/-/blob/master/COPYING?ref_type\u003dheads#L185-197", - "https://gitlab.freedesktop.org/xorg/lib/libxtst/-/blob/master/COPYING?ref_type\u003dheads#L70-77" + "https://gitlab.freedesktop.org/xorg/lib/libxext/-/blob/HEAD/COPYING?ref_type\u003dheads#L185-197", + "https://gitlab.freedesktop.org/xorg/lib/libxtst/-/blob/HEAD/COPYING?ref_type\u003dheads#L70-77" ], "isOsiApproved": false }, @@ -4007,8 +4007,8 @@ "name": "Historical Permission Notice and Disclaimer - documentation sell variant", "licenseId": "HPND-doc-sell", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/lib/libxtst/-/blob/master/COPYING?ref_type\u003dheads#L108-117", - "https://gitlab.freedesktop.org/xorg/lib/libxext/-/blob/master/COPYING?ref_type\u003dheads#L153-162" + "https://gitlab.freedesktop.org/xorg/lib/libxtst/-/blob/HEAD/COPYING?ref_type\u003dheads#L108-117", + "https://gitlab.freedesktop.org/xorg/lib/libxext/-/blob/HEAD/COPYING?ref_type\u003dheads#L153-162" ], "isOsiApproved": false }, @@ -4071,8 +4071,8 @@ "name": "Historical Permission Notice and Disclaimer - Fenneberg-Livingston variant", "licenseId": "HPND-Fenneberg-Livingston", "seeAlso": [ - "https://github.com/FreeRADIUS/freeradius-client/blob/master/COPYRIGHT#L32", - "https://github.com/radcli/radcli/blob/master/COPYRIGHT#L34" + "https://github.com/FreeRADIUS/freeradius-client/blob/HEAD/COPYRIGHT#L32", + "https://github.com/radcli/radcli/blob/HEAD/COPYRIGHT#L34" ], "isOsiApproved": false }, @@ -4084,7 +4084,7 @@ "name": "Historical Permission Notice and Disclaimer - INRIA-IMAG variant", "licenseId": "HPND-INRIA-IMAG", "seeAlso": [ - "https://github.com/ppp-project/ppp/blob/master/pppd/ipv6cp.c#L75-L83" + "https://github.com/ppp-project/ppp/blob/HEAD/pppd/ipv6cp.c#L75-L83" ], "isOsiApproved": false }, @@ -4179,7 +4179,7 @@ "name": "Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer", "licenseId": "HPND-sell-MIT-disclaimer-xserver", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/COPYING?ref_type\u003dheads#L1781" + "https://gitlab.freedesktop.org/xorg/xserver/-/blob/HEAD/COPYING?ref_type\u003dheads#L1781" ], "isOsiApproved": false }, @@ -4204,7 +4204,7 @@ "licenseId": "HPND-sell-variant", "seeAlso": [ "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/sunrpc/auth_gss/gss_generic_token.c?h\u003dv4.19", - "https://github.com/kfish/xsel/blob/master/COPYING" + "https://github.com/kfish/xsel/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -4216,7 +4216,7 @@ "name": "HPND sell variant with MIT disclaimer", "licenseId": "HPND-sell-variant-MIT-disclaimer", "seeAlso": [ - "https://github.com/sigmavirus24/x11-ssh-askpass/blob/master/README" + "https://github.com/sigmavirus24/x11-ssh-askpass/blob/HEAD/README" ], "isOsiApproved": false }, @@ -4228,7 +4228,7 @@ "name": "HPND sell variant with MIT disclaimer - reverse", "licenseId": "HPND-sell-variant-MIT-disclaimer-rev", "seeAlso": [ - "https://github.com/sigmavirus24/x11-ssh-askpass/blob/master/dynlist.c" + "https://github.com/sigmavirus24/x11-ssh-askpass/blob/HEAD/dynlist.c" ], "isOsiApproved": false }, @@ -4252,7 +4252,7 @@ "name": "Historical Permission Notice and Disclaimer - University of California, US export warning", "licenseId": "HPND-UC-export-US", "seeAlso": [ - "https://github.com/RTimothyEdwards/magic/blob/master/LICENSE" + "https://github.com/RTimothyEdwards/magic/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -4494,7 +4494,7 @@ "licenseId": "ISC-Veillard", "seeAlso": [ "https://raw.githubusercontent.com/GNOME/libxml2/4c2e7c651f6c2f0d1a74f350cbda95f7df3e7017/hash.c", - "https://github.com/GNOME/libxml2/blob/master/dict.c", + "https://github.com/GNOME/libxml2/blob/HEAD/dict.c", "https://sourceforge.net/p/ctrio/git/ci/master/tree/README" ], "isOsiApproved": false @@ -4544,7 +4544,7 @@ "name": "Japan Network Information Center License", "licenseId": "JPNIC", "seeAlso": [ - "https://gitlab.isc.org/isc-projects/bind9/blob/master/COPYRIGHT#L366" + "https://gitlab.isc.org/isc-projects/bind9/blob/HEAD/COPYRIGHT#L366" ], "isOsiApproved": false }, @@ -4865,7 +4865,7 @@ "name": "libselinux public domain notice", "licenseId": "libselinux-1.0", "seeAlso": [ - "https://github.com/SELinuxProject/selinux/blob/master/libselinux/LICENSE" + "https://github.com/SELinuxProject/selinux/blob/HEAD/libselinux/LICENSE" ], "isOsiApproved": false }, @@ -5005,9 +5005,9 @@ "https://gitlab.com/embeddable-common-lisp/ecl/-/blob/develop/src/lsp/loop.lsp", "http://git.savannah.gnu.org/cgit/gcl.git/tree/gcl/lsp/gcl_loop.lsp?h\u003dVersion_2_6_13pre", "https://sourceforge.net/p/sbcl/sbcl/ci/master/tree/src/code/loop.lisp", - "https://github.com/cl-adams/adams/blob/master/LICENSE.md", - "https://github.com/blakemcbride/eclipse-lisp/blob/master/lisp/loop.lisp", - "https://gitlab.common-lisp.net/cmucl/cmucl/-/blob/master/src/code/loop.lisp" + "https://github.com/cl-adams/adams/blob/HEAD/LICENSE.md", + "https://github.com/blakemcbride/eclipse-lisp/blob/HEAD/lisp/loop.lisp", + "https://gitlab.common-lisp.net/cmucl/cmucl/-/blob/HEAD/src/code/loop.lisp" ], "isOsiApproved": false }, @@ -5121,7 +5121,7 @@ "name": "lsof License", "licenseId": "lsof", "seeAlso": [ - "https://github.com/lsof-org/lsof/blob/master/COPYING" + "https://github.com/lsof-org/lsof/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -5133,7 +5133,7 @@ "name": "Lucida Bitmap Fonts License", "licenseId": "Lucida-Bitmap-Fonts", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/font/bh-100dpi/-/blob/master/COPYING?ref_type\u003dheads" + "https://gitlab.freedesktop.org/xorg/font/bh-100dpi/-/blob/HEAD/COPYING?ref_type\u003dheads" ], "isOsiApproved": false }, @@ -5171,7 +5171,7 @@ "name": "Mackerras 3-Clause License", "licenseId": "Mackerras-3-Clause", "seeAlso": [ - "https://github.com/ppp-project/ppp/blob/master/pppd/chap_ms.c#L6-L28" + "https://github.com/ppp-project/ppp/blob/HEAD/pppd/chap_ms.c#L6-L28" ], "isOsiApproved": false }, @@ -5183,7 +5183,7 @@ "name": "Mackerras 3-Clause - acknowledgment variant", "licenseId": "Mackerras-3-Clause-acknowledgment", "seeAlso": [ - "https://github.com/ppp-project/ppp/blob/master/pppd/auth.c#L6-L28" + "https://github.com/ppp-project/ppp/blob/HEAD/pppd/auth.c#L6-L28" ], "isOsiApproved": false }, @@ -5255,7 +5255,7 @@ "name": "metamail License", "licenseId": "metamail", "seeAlso": [ - "https://github.com/Dual-Life/mime-base64/blob/master/Base64.xs#L12" + "https://github.com/Dual-Life/mime-base64/blob/HEAD/Base64.xs#L12" ], "isOsiApproved": false }, @@ -5268,7 +5268,7 @@ "licenseId": "Minpack", "seeAlso": [ "http://www.netlib.org/minpack/disclaimer", - "https://gitlab.com/libeigen/eigen/-/blob/master/COPYING.MINPACK" + "https://gitlab.com/libeigen/eigen/-/blob/HEAD/COPYING.MINPACK" ], "isOsiApproved": false }, @@ -5319,7 +5319,7 @@ "seeAlso": [ "https://github.com/aws/mit-0", "https://romanrm.net/mit-zero", - "https://github.com/awsdocs/aws-cloud9-user-guide/blob/master/LICENSE-SAMPLECODE" + "https://github.com/awsdocs/aws-cloud9-user-guide/blob/HEAD/LICENSE-SAMPLECODE" ], "isOsiApproved": true }, @@ -5343,7 +5343,7 @@ "name": "MIT Click License", "licenseId": "MIT-Click", "seeAlso": [ - "https://github.com/kohler/t1utils/blob/master/LICENSE" + "https://github.com/kohler/t1utils/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -5392,8 +5392,8 @@ "name": "MIT Festival Variant", "licenseId": "MIT-Festival", "seeAlso": [ - "https://github.com/festvox/flite/blob/master/COPYING", - "https://github.com/festvox/speech_tools/blob/master/COPYING" + "https://github.com/festvox/flite/blob/HEAD/COPYING", + "https://github.com/festvox/speech_tools/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -5431,10 +5431,10 @@ "name": "MIT Open Group variant", "licenseId": "MIT-open-group", "seeAlso": [ - "https://gitlab.freedesktop.org/xorg/app/iceauth/-/blob/master/COPYING", - "https://gitlab.freedesktop.org/xorg/app/xvinfo/-/blob/master/COPYING", - "https://gitlab.freedesktop.org/xorg/app/xsetroot/-/blob/master/COPYING", - "https://gitlab.freedesktop.org/xorg/app/xauth/-/blob/master/COPYING" + "https://gitlab.freedesktop.org/xorg/app/iceauth/-/blob/HEAD/COPYING", + "https://gitlab.freedesktop.org/xorg/app/xvinfo/-/blob/HEAD/COPYING", + "https://gitlab.freedesktop.org/xorg/app/xsetroot/-/blob/HEAD/COPYING", + "https://gitlab.freedesktop.org/xorg/app/xauth/-/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -5458,7 +5458,7 @@ "name": "MIT Tom Wu Variant", "licenseId": "MIT-Wu", "seeAlso": [ - "https://github.com/chromium/octane/blob/master/crypto.js" + "https://github.com/chromium/octane/blob/HEAD/crypto.js" ], "isOsiApproved": false }, @@ -5482,7 +5482,7 @@ "name": "MMIXware License", "licenseId": "MMIXware", "seeAlso": [ - "https://gitlab.lrz.de/mmix/mmixware/-/blob/master/boilerplate.w" + "https://gitlab.lrz.de/mmix/mmixware/-/blob/HEAD/boilerplate.w" ], "isOsiApproved": false }, @@ -5609,7 +5609,7 @@ "licenseId": "MS-LPL", "seeAlso": [ "https://www.openhub.net/licenses/mslpl", - "https://github.com/gabegundy/atlserver/blob/master/License.txt", + "https://github.com/gabegundy/atlserver/blob/HEAD/License.txt", "https://en.wikipedia.org/wiki/Shared_Source_Initiative#Microsoft_Limited_Public_License_(Ms-LPL)" ], "isOsiApproved": false @@ -5766,7 +5766,7 @@ "https://github.com/ncbi/datasets/blob/0ea4cd16b61e5b799d9cc55aecfa016d6c9bd2bf/LICENSE.md", "https://github.com/ncbi/gprobe/blob/de64d30fee8b4c4013094d7d3139ea89b5dd1ace/LICENSE", "https://github.com/ncbi/egapx/blob/08930b9dec0c69b2d1a05e5153c7b95ef0a3eb0f/LICENSE", - "https://github.com/ncbi/datasets/blob/master/LICENSE.md" + "https://github.com/ncbi/datasets/blob/HEAD/LICENSE.md" ], "isOsiApproved": false }, @@ -5790,7 +5790,7 @@ "name": "NCL Source Code License", "licenseId": "NCL", "seeAlso": [ - "https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/modules/module-filter-chain/pffft.c?ref_type\u003dheads#L1-52" + "https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/HEAD/src/modules/module-filter-chain/pffft.c?ref_type\u003dheads#L1-52" ], "isOsiApproved": false }, @@ -6050,7 +6050,7 @@ "name": "NTP No Attribution", "licenseId": "NTP-0", "seeAlso": [ - "https://github.com/tytso/e2fsprogs/blob/master/lib/et/et_name.c" + "https://github.com/tytso/e2fsprogs/blob/HEAD/lib/et/et_name.c" ], "isOsiApproved": false }, @@ -6544,7 +6544,7 @@ "name": "OpenPBS v2.3 Software License", "licenseId": "OpenPBS-2.3", "seeAlso": [ - "https://github.com/adaptivecomputing/torque/blob/master/PBS_License.txt", + "https://github.com/adaptivecomputing/torque/blob/HEAD/PBS_License.txt", "https://www.mcs.anl.gov/research/projects/openpbs/PBS_License.txt" ], "isOsiApproved": false @@ -6717,7 +6717,7 @@ "name": "PADL License", "licenseId": "PADL", "seeAlso": [ - "https://git.openldap.org/openldap/openldap/-/blob/master/libraries/libldap/os-local.c?ref_type\u003dheads#L19-23" + "https://git.openldap.org/openldap/openldap/-/blob/HEAD/libraries/libldap/os-local.c?ref_type\u003dheads#L19-23" ], "isOsiApproved": false }, @@ -6806,7 +6806,7 @@ "name": "pkgconf License", "licenseId": "pkgconf", "seeAlso": [ - "https://github.com/pkgconf/pkgconf/blob/master/cli/main.c#L8" + "https://github.com/pkgconf/pkgconf/blob/HEAD/cli/main.c#L8" ], "isOsiApproved": false }, @@ -6996,7 +6996,7 @@ "name": "Q Public License 1.0 - INRIA 2004 variant", "licenseId": "QPL-1.0-INRIA-2004", "seeAlso": [ - "https://github.com/maranget/hevea/blob/master/LICENSE" + "https://github.com/maranget/hevea/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -7008,7 +7008,7 @@ "name": "radvd License", "licenseId": "radvd", "seeAlso": [ - "https://github.com/radvd-project/radvd/blob/master/COPYRIGHT" + "https://github.com/radvd-project/radvd/blob/HEAD/COPYRIGHT" ], "isOsiApproved": false }, @@ -7219,7 +7219,7 @@ "name": "Sendmail Open Source License v1.1", "licenseId": "Sendmail-Open-Source-1.1", "seeAlso": [ - "https://github.com/trusteddomainproject/OpenDMARC/blob/master/LICENSE.Sendmail" + "https://github.com/trusteddomainproject/OpenDMARC/blob/HEAD/LICENSE.Sendmail" ], "isOsiApproved": false }, @@ -7268,7 +7268,7 @@ "name": "SGI OpenGL License", "licenseId": "SGI-OpenGL", "seeAlso": [ - "https://gitlab.freedesktop.org/mesa/glw/-/blob/master/README?ref_type\u003dheads" + "https://gitlab.freedesktop.org/mesa/glw/-/blob/HEAD/README?ref_type\u003dheads" ], "isOsiApproved": false }, @@ -7354,7 +7354,7 @@ "name": "SL License", "licenseId": "SL", "seeAlso": [ - "https://github.com/mtoyoda/sl/blob/master/LICENSE" + "https://github.com/mtoyoda/sl/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -7404,7 +7404,7 @@ "name": "Secure Messaging Protocol Public License", "licenseId": "SMPPL", "seeAlso": [ - "https://github.com/dcblake/SMP/blob/master/Documentation/License.txt" + "https://github.com/dcblake/SMP/blob/HEAD/Documentation/License.txt" ], "isOsiApproved": false }, @@ -7428,7 +7428,7 @@ "name": "snprintf License", "licenseId": "snprintf", "seeAlso": [ - "https://github.com/openssh/openssh-portable/blob/master/openbsd-compat/bsd-snprintf.c#L2" + "https://github.com/openssh/openssh-portable/blob/HEAD/openbsd-compat/bsd-snprintf.c#L2" ], "isOsiApproved": false }, @@ -7440,7 +7440,7 @@ "name": "softSurfer License", "licenseId": "softSurfer", "seeAlso": [ - "https://github.com/mm2/Little-CMS/blob/master/src/cmssm.c#L207", + "https://github.com/mm2/Little-CMS/blob/HEAD/src/cmssm.c#L207", "https://fedoraproject.org/wiki/Licensing/softSurfer" ], "isOsiApproved": false @@ -7515,7 +7515,7 @@ "name": "ssh-keyscan License", "licenseId": "ssh-keyscan", "seeAlso": [ - "https://github.com/openssh/openssh-portable/blob/master/LICENCE#L82" + "https://github.com/openssh/openssh-portable/blob/HEAD/LICENCE#L82" ], "isOsiApproved": false }, @@ -7602,7 +7602,7 @@ "name": "Sun PPP License", "licenseId": "Sun-PPP", "seeAlso": [ - "https://github.com/ppp-project/ppp/blob/master/pppd/eap.c#L7-L16" + "https://github.com/ppp-project/ppp/blob/HEAD/pppd/eap.c#L7-L16" ], "isOsiApproved": false }, @@ -7614,7 +7614,7 @@ "name": "Sun PPP License (2000)", "licenseId": "Sun-PPP-2000", "seeAlso": [ - "https://github.com/ppp-project/ppp/blob/master/modules/ppp_ahdlc.c#L7-L19" + "https://github.com/ppp-project/ppp/blob/HEAD/modules/ppp_ahdlc.c#L7-L19" ], "isOsiApproved": false }, @@ -7712,7 +7712,7 @@ "name": "TermReadKey License", "licenseId": "TermReadKey", "seeAlso": [ - "https://github.com/jonathanstowe/TermReadKey/blob/master/README#L9-L10" + "https://github.com/jonathanstowe/TermReadKey/blob/HEAD/README#L9-L10" ], "isOsiApproved": false }, @@ -7834,7 +7834,7 @@ "licenseId": "TTWL", "seeAlso": [ "https://fedoraproject.org/wiki/Licensing/TTWL", - "https://github.com/ap/Text-Tabs/blob/master/lib.modern/Text/Tabs.pm#L148" + "https://github.com/ap/Text-Tabs/blob/HEAD/lib.modern/Text/Tabs.pm#L148" ], "isOsiApproved": false }, @@ -7895,7 +7895,7 @@ "name": "UCAR License", "licenseId": "UCAR", "seeAlso": [ - "https://github.com/Unidata/UDUNITS-2/blob/master/COPYRIGHT" + "https://github.com/Unidata/UDUNITS-2/blob/HEAD/COPYRIGHT" ], "isOsiApproved": false }, @@ -7931,7 +7931,7 @@ "name": "Michigan/Merit Networks License", "licenseId": "UMich-Merit", "seeAlso": [ - "https://github.com/radcli/radcli/blob/master/COPYRIGHT#L64" + "https://github.com/radcli/radcli/blob/HEAD/COPYRIGHT#L64" ], "isOsiApproved": false }, @@ -8124,7 +8124,7 @@ "name": "w3m License", "licenseId": "w3m", "seeAlso": [ - "https://github.com/tats/w3m/blob/master/COPYING" + "https://github.com/tats/w3m/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -8149,7 +8149,7 @@ "name": "Widget Workshop License", "licenseId": "Widget-Workshop", "seeAlso": [ - "https://github.com/novnc/noVNC/blob/master/core/crypto/des.js#L24" + "https://github.com/novnc/noVNC/blob/HEAD/core/crypto/des.js#L24" ], "isOsiApproved": false }, @@ -8224,7 +8224,7 @@ "name": "X11 License Distribution Modification Variant", "licenseId": "X11-distribute-modifications-variant", "seeAlso": [ - "https://github.com/mirror/ncurses/blob/master/COPYING" + "https://github.com/mirror/ncurses/blob/HEAD/COPYING" ], "isOsiApproved": false }, @@ -8236,7 +8236,7 @@ "name": "X11 swapped final paragraphs", "licenseId": "X11-swapped", "seeAlso": [ - "https://github.com/fedeinthemix/chez-srfi/blob/master/srfi/LICENSE" + "https://github.com/fedeinthemix/chez-srfi/blob/HEAD/srfi/LICENSE" ], "isOsiApproved": false }, @@ -8248,7 +8248,7 @@ "name": "Xdebug License v 1.03", "licenseId": "Xdebug-1.03", "seeAlso": [ - "https://github.com/xdebug/xdebug/blob/master/LICENSE" + "https://github.com/xdebug/xdebug/blob/HEAD/LICENSE" ], "isOsiApproved": false }, @@ -8272,7 +8272,7 @@ "name": "Xfig License", "licenseId": "Xfig", "seeAlso": [ - "https://github.com/Distrotech/transfig/blob/master/transfig/transfig.c", + "https://github.com/Distrotech/transfig/blob/HEAD/transfig/transfig.c", "https://fedoraproject.org/wiki/Licensing:MIT#Xfig_Variant", "https://sourceforge.net/p/mcj/xfig/ci/master/tree/src/Makefile.am" ], @@ -8312,7 +8312,7 @@ "name": "xkeyboard-config Zinoviev License", "licenseId": "xkeyboard-config-Zinoviev", "seeAlso": [ - "https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/master/COPYING?ref_type\u003dheads#L178" + "https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/HEAD/COPYING?ref_type\u003dheads#L178" ], "isOsiApproved": false }, @@ -8530,4 +8530,4 @@ } ], "releaseDate": "2024-12-30T00:00:00Z" -} \ No newline at end of file +} diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb index 182c00241f..70f2679c00 100644 --- a/Library/Homebrew/dev-cmd/tests.rb +++ b/Library/Homebrew/dev-cmd/tests.rb @@ -25,7 +25,7 @@ module Homebrew switch "--debug", description: "Enable debugging using `ruby/debug`, or surface the standard `odebug` output." switch "--changed", - description: "Only runs tests on files that were changed from the master branch." + description: "Only runs tests on files that were changed from the `main` branch." switch "--fail-fast", description: "Exit early on the first failing test." switch "--no-parallel", @@ -198,9 +198,9 @@ module Homebrew sig { returns(T::Array[String]) } def changed_test_files - changed_files = Utils.popen_read("git", "diff", "--name-only", "master") + changed_files = Utils.popen_read("git", "diff", "--name-only", "main") - raise UsageError, "No files have been changed from the master branch!" if changed_files.blank? + raise UsageError, "No files have been changed from the `main` branch!" if changed_files.blank? filestub_regex = %r{Library/Homebrew/([\w/-]+).rb} changed_files.scan(filestub_regex).map(&:last).filter_map do |filestub| diff --git a/Library/Homebrew/dev-cmd/update-test.rb b/Library/Homebrew/dev-cmd/update-test.rb index ec22c04843..e6b495dba2 100644 --- a/Library/Homebrew/dev-cmd/update-test.rb +++ b/Library/Homebrew/dev-cmd/update-test.rb @@ -12,7 +12,7 @@ module Homebrew cmd_args do description <<~EOS Run a test of `brew update` with a new repository clone. - If no options are passed, use `origin/master` as the start commit. + If no options are passed, use `origin/main` as the start commit. EOS switch "--to-tag", description: "Set `$HOMEBREW_UPDATE_TO_TAG` to test updating between tags." @@ -47,7 +47,7 @@ module Homebrew "stable" else ENV["HOMEBREW_DEV_CMD_RUN"] = "1" - "master" + "main" end # Utils.popen_read returns a String without a block argument, but that isn't easily typed. We thus label this @@ -58,7 +58,7 @@ module Homebrew start_commit = if (commit = args.commit) commit elsif (date = args.before) - Utils.popen_read("git", "rev-list", "-n1", "--before=#{date}", "origin/master").chomp + Utils.popen_read("git", "rev-list", "-n1", "--before=#{date}", "origin/main").chomp elsif args.to_tag? tags = git_tags current_tag, previous_tag, = tags.lines @@ -72,7 +72,7 @@ module Homebrew # ^0 ensures this points to the commit rather than the tag object. "#{previous_tag}^0" else - Utils.popen_read("git", "merge-base", "origin/master", end_commit).chomp + Utils.popen_read("git", "merge-base", "origin/main", end_commit).chomp end odie "Could not find start commit!" if start_commit.empty? @@ -82,8 +82,8 @@ module Homebrew end_commit = T.cast(Utils.popen_read("git", "rev-parse", end_commit).chomp, String) odie "Could not find end commit!" if end_commit.empty? - if Utils.popen_read("git", "branch", "--list", "master").blank? - safe_system "git", "branch", "master", "origin/master" + if Utils.popen_read("git", "branch", "--list", "main").blank? + safe_system "git", "branch", "main", "origin/HEAD" end end @@ -99,17 +99,17 @@ module Homebrew oh1 "Preparing test environment..." # copy Homebrew installation safe_system "git", "clone", "#{HOMEBREW_REPOSITORY}/.git", ".", - "--branch", "master", "--single-branch" + "--branch", "main", "--single-branch" # set git origin to another copy safe_system "git", "clone", "#{HOMEBREW_REPOSITORY}/.git", "remote.git", - "--bare", "--branch", "master", "--single-branch" + "--bare", "--branch", "main", "--single-branch" safe_system "git", "config", "remote.origin.url", "#{curdir}/remote.git" ENV["HOMEBREW_BREW_GIT_REMOTE"] = "#{curdir}/remote.git" # force push origin to end_commit - safe_system "git", "checkout", "-B", "master", end_commit - safe_system "git", "push", "--force", "origin", "master" + safe_system "git", "checkout", "-B", "main", end_commit + safe_system "git", "push", "--force", "origin", "main" # set test copy to start_commit safe_system "git", "reset", "--hard", start_commit diff --git a/Library/Homebrew/download_queue.rb b/Library/Homebrew/download_queue.rb index c77b5c1d67..8340e7347d 100644 --- a/Library/Homebrew/download_queue.rb +++ b/Library/Homebrew/download_queue.rb @@ -31,7 +31,7 @@ module Homebrew sig { void } def cancel # FIXME: Implement graceful cancellaction of running downloads based on - # https://ruby-concurrency.github.io/concurrent-ruby/master/Concurrent/Cancellation.html + # https://ruby-concurrency.github.io/concurrent-ruby/HEAD/Concurrent/Cancellation.html # instead of killing the whole thread pool. pool.kill end diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index 0e3f3571a7..5a95f1d83d 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -214,7 +214,7 @@ module Homebrew INCOMPATIBLE_LICENSES = [ "Aladdin", # https://www.gnu.org/licenses/license-list.html#Aladdin "CPOL-1.02", # https://www.gnu.org/licenses/license-list.html#cpol - "gSOAP-1.3b", # https://salsa.debian.org/ellert/gsoap/-/blob/master/debian/copyright + "gSOAP-1.3b", # https://salsa.debian.org/ellert/gsoap/-/blob/HEAD/debian/copyright "JSON", # https://wiki.debian.org/DFSGLicenses#JSON_evil_license "MS-LPL", # https://github.com/spdx/license-list-XML/issues/1432#issuecomment-1077680709 "OPL-1.0", # https://wiki.debian.org/DFSGLicenses#Open_Publication_License_.28OPL.29_v1.0 @@ -407,7 +407,7 @@ module Homebrew base_info = event_payload.dig("pull_request", "base").to_h # handle `nil` # We need to read the head ref from `GITHUB_EVENT_PATH` because - # `git branch --show-current` returns `master` on PR branches. + # `git branch --show-current` returns the default branch on PR branches. staging_branch = base_info["ref"]&.end_with?("-staging") homebrew_owned_repo = base_info.dig("repo", "owner", "login") == "Homebrew" homebrew_core_pr = base_info.dig("repo", "name") == "homebrew-core" diff --git a/Library/Homebrew/github_runner_matrix.rb b/Library/Homebrew/github_runner_matrix.rb index 2e424c479d..3c013423b5 100644 --- a/Library/Homebrew/github_runner_matrix.rb +++ b/Library/Homebrew/github_runner_matrix.rb @@ -95,7 +95,7 @@ class GitHubRunnerMatrix name: "Linux #{arch}", runner: linux_runner, container: { - image: "ghcr.io/homebrew/ubuntu22.04:master", + image: "ghcr.io/homebrew/ubuntu22.04:main", options: "--user=linuxbrew -e GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED", }, workdir: "/github/home", diff --git a/Library/Homebrew/rubocops/shared/url_helper.rb b/Library/Homebrew/rubocops/shared/url_helper.rb index e715ff607d..3919d63469 100644 --- a/Library/Homebrew/rubocops/shared/url_helper.rb +++ b/Library/Homebrew/rubocops/shared/url_helper.rb @@ -223,9 +223,9 @@ module RuboCop problem "Please use https:// for #{url}" end - # Check for master branch GitHub archives. + # Check for default branch GitHub archives. if type == :formula - tarball_gh_pattern = %r{^https://github\.com/.*archive/master\.(tar\.gz|zip)$} + tarball_gh_pattern = %r{^https://github\.com/.*archive/(main|master)\.(tar\.gz|zip)$} audit_urls(urls, tarball_gh_pattern) do problem "Use versioned rather than branch tarballs for stable checksums." end diff --git a/Library/Homebrew/sorbet/tapioca/compilers/rubocop.rb b/Library/Homebrew/sorbet/tapioca/compilers/rubocop.rb index 86760ca502..4708f0ea0f 100644 --- a/Library/Homebrew/sorbet/tapioca/compilers/rubocop.rb +++ b/Library/Homebrew/sorbet/tapioca/compilers/rubocop.rb @@ -33,8 +33,8 @@ module Tapioca source = constant.instance_method(method_name).source.lstrip # For more info on these DSLs: # https://www.rubydoc.info/gems/rubocop-ast/RuboCop/AST/NodePattern/Macros - # https://github.com/rubocop/rubocop-ast/blob/master/lib/rubocop/ast/node_pattern.rb - # https://github.com/rubocop/rubocop-ast/blob/master/lib/rubocop/ast/node_pattern/method_definer.rb + # https://github.com/rubocop/rubocop-ast/blob/HEAD/lib/rubocop/ast/node_pattern.rb + # https://github.com/rubocop/rubocop-ast/blob/HEAD/lib/rubocop/ast/node_pattern/method_definer.rb # The type signatures below could maybe be stronger, but I only wanted to avoid errors: case source when /\Adef_node_matcher/ diff --git a/Library/Homebrew/test/linux_runner_spec_spec.rb b/Library/Homebrew/test/linux_runner_spec_spec.rb index 8b986c1dd4..4e89a4a076 100644 --- a/Library/Homebrew/test/linux_runner_spec_spec.rb +++ b/Library/Homebrew/test/linux_runner_spec_spec.rb @@ -7,7 +7,7 @@ RSpec.describe LinuxRunnerSpec do described_class.new( name: "Linux", runner: "ubuntu-latest", - container: { image: "ghcr.io/homebrew/ubuntu22.04:master", options: "--user=linuxbrew" }, + container: { image: "ghcr.io/homebrew/ubuntu22.04:main", options: "--user=linuxbrew" }, workdir: "/github/home", timeout: 360, cleanup: false, diff --git a/Library/Homebrew/test/rubocops/urls_spec.rb b/Library/Homebrew/test/rubocops/urls_spec.rb index 393d52a6b4..a5574f9ddc 100644 --- a/Library/Homebrew/test/rubocops/urls_spec.rb +++ b/Library/Homebrew/test/rubocops/urls_spec.rb @@ -125,7 +125,7 @@ RSpec.describe RuboCop::Cop::FormulaAudit::Urls do "msg" => "Please use https:// for http://github.com/foo/foo5.git", "col" => 2, }, { - "url" => "https://github.com/foo/foobar/archive/master.zip", + "url" => "https://github.com/foo/foobar/archive/main.zip", "msg" => "Use versioned rather than branch tarballs for stable checksums.", "col" => 2, }, { diff --git a/README.md b/README.md index fdfcf448cb..764e854d1d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Homebrew [![GitHub release](https://img.shields.io/github/release/Homebrew/brew.svg)](https://github.com/Homebrew/brew/releases) -[![License](https://img.shields.io/github/license/Homebrew/brew)](https://github.com/Homebrew/brew/blob/master/LICENSE.txt) +[![License](https://img.shields.io/github/license/Homebrew/brew)](https://github.com/Homebrew/brew/blob/HEAD/LICENSE.txt) Features, usage and installation instructions are [summarised on the homepage](https://brew.sh). Terminology (e.g. the difference between a Cellar, Tap, Cask and so forth) is [explained here](https://docs.brew.sh/Formula-Cookbook#homebrew-terminology). diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 6dd4787b99..0033d67ee7 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -1686,7 +1686,7 @@ __fish_brew_complete_arg 'test' -a '(__fish_brew_suggest_formulae_installed)' __fish_brew_complete_cmd 'tests' 'Run Homebrew\'s unit and integration tests' -__fish_brew_complete_arg 'tests' -l changed -d 'Only runs tests on files that were changed from the master branch' +__fish_brew_complete_arg 'tests' -l changed -d 'Only runs tests on files that were changed from the `main` branch' __fish_brew_complete_arg 'tests' -l coverage -d 'Generate code coverage reports' __fish_brew_complete_arg 'tests' -l debug -d 'Enable debugging using `ruby/debug`, or surface the standard `odebug` output' __fish_brew_complete_arg 'tests' -l fail-fast -d 'Exit early on the first failing test' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index c0c844291e..eebd1cecd8 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -2074,7 +2074,7 @@ _brew_test() { # brew tests _brew_tests() { _arguments \ - '(--only)--changed[Only runs tests on files that were changed from the master branch]' \ + '(--only)--changed[Only runs tests on files that were changed from the `main` branch]' \ '--coverage[Generate code coverage reports]' \ '--debug[Enable debugging using `ruby/debug`, or surface the standard `odebug` output]' \ '--fail-fast[Exit early on the first failing test]' \ diff --git a/docs/Acceptable-Formulae.md b/docs/Acceptable-Formulae.md index fa8f6d2ea2..a5e3e94c06 100644 --- a/docs/Acceptable-Formulae.md +++ b/docs/Acceptable-Formulae.md @@ -40,7 +40,7 @@ Software that can upgrade itself does not integrate well with Homebrew formulae' ### We don’t like install scripts that download unversioned things -We don't like install scripts that are pulling from the master branch of Git repositories or unversioned, unchecksummed tarballs. These should ideally use `resource` blocks with specific revisions or checksummed tarballs instead. Note that we now allow tools like `cargo`, `gem` and `pip` to download versioned libraries during installation. There's no need to reproduce the functionality of any language package manager with `resource` blocks when we can call it instead. +We don't like install scripts that are pulling from the default branch of Git repositories or unversioned, unchecksummed tarballs. These should ideally use `resource` blocks with specific revisions or checksummed tarballs instead. Note that we now allow tools like `cargo`, `gem` and `pip` to download versioned libraries during installation. There's no need to reproduce the functionality of any language package manager with `resource` blocks when we can call it instead. ### We don’t like binary formulae diff --git a/docs/Adding-Software-to-Homebrew.md b/docs/Adding-Software-to-Homebrew.md index 694c0b24aa..7d25d49d21 100644 --- a/docs/Adding-Software-to-Homebrew.md +++ b/docs/Adding-Software-to-Homebrew.md @@ -222,9 +222,9 @@ Example: 1. The folder `Simple Floating Clock` contains the application `SimpleFloatingClock.app`. 1. So, the `app` stanza should include the subfolder as a relative path: - ```ruby +```ruby app "Simple Floating Clock/SimpleFloatingClock.app" - ``` +``` ### Testing and auditing the cask @@ -271,7 +271,7 @@ Hop into your tap and check to make sure your new cask is there: ```console $ cd "$(brew --repository)"/Library/Taps/homebrew/homebrew-cask $ git status -On branch master +On branch main Untracked files: (use "git add ..." to include in what will be committed) Casks/m/my-new-cask.rb @@ -355,7 +355,7 @@ Now go to the [`homebrew-cask` GitHub repository](https://github.com/Homebrew/ho Otherwise, click the `Contribute > Open pull request` button and choose to `compare across forks`. The base fork should be `Homebrew/homebrew-cask @ master`, and the head fork should be `my-github-username/homebrew-cask @ my-new-cask-branch`. You can also add any further comments to your pull request at this stage. -##### Congratulations! +##### Congratulations You are done now, and your cask should be pulled in or otherwise noticed in a while. If a maintainer suggests some changes, just make them on the `my-new-cask-branch` branch locally and [push](#pushing). diff --git a/docs/Brew-Bundle-and-Brewfile.md b/docs/Brew-Bundle-and-Brewfile.md index 27894a7bcb..c13a0e741c 100644 --- a/docs/Brew-Bundle-and-Brewfile.md +++ b/docs/Brew-Bundle-and-Brewfile.md @@ -86,9 +86,9 @@ Adding a `Brewfile` to a project's repository (like you might a `package.json`, It allows you to tell users to run a single command to install all dependencies for a project and start any services. -As Homebrew supports both macOS, Linux and WSL: you can have this single command setup project dependencies on three operating systems and in continuous integration services like GitHub Actions (where it's installed by default on macOS and easily on Linux with [`Homebrew/actions/setup-homebrew`](https://github.com/Homebrew/actions/tree/master/setup-homebrew)). +As Homebrew supports both macOS, Linux and WSL: you can have this single command setup project dependencies on three operating systems and in continuous integration services like GitHub Actions (where it's installed by default on macOS and easily on Linux with [`Homebrew/actions/setup-homebrew`](https://github.com/Homebrew/actions/tree/HEAD/setup-homebrew)). -See [GitHub's "Scripts To Rule Them All" `script/bootstrap` example](https://github.com/github/scripts-to-rule-them-all/blob/master/script/bootstrap) +See [GitHub's "Scripts To Rule Them All" `script/bootstrap` example](https://github.com/github/scripts-to-rule-them-all/blob/HEAD/script/bootstrap) for how you might use a `Brewfile` and `brew bundle` to install project dependencies with Homebrew. ### `brew bundle dump` diff --git a/docs/Common-Issues-for-Core-Contributors.md b/docs/Common-Issues-for-Core-Contributors.md index afe762643b..a7b29460a8 100644 --- a/docs/Common-Issues-for-Core-Contributors.md +++ b/docs/Common-Issues-for-Core-Contributors.md @@ -21,7 +21,7 @@ Alternative instructions using `pr-pull`: * `git reset --hard ` in `homebrew/core` to reset to the commit before all the commits created by `brew pr-pull`. * `brew pr-pull ` to upload the right bottles. Add the `--warn-on-upload-failure` switch if the bottles have been partially uploaded and you're certain that the bottle checksums will match the checksums already present in the `bottle do` block of the formula. -* `git reset --hard origin/master` to return to the latest commit and discard the commits made by `brew pr-pull`. +* `git reset --hard origin/HEAD` to return to the latest commit and discard the commits made by `brew pr-pull`. ### `ld: internal error: atom not found in symbolIndex(__ZN10SQInstance3GetERK11SQObjectPtrRS0_) for architecture x86_64` diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md index 257555e8e1..cc4d2c122a 100644 --- a/docs/Common-Issues.md +++ b/docs/Common-Issues.md @@ -110,8 +110,8 @@ Don't follow the advice here but fix by using When installing Homebrew, if the initial download fails with something like: - error: Not a valid ref: refs/remotes/origin/master - fatal: ambiguous argument 'refs/remotes/origin/master': unknown revision or path not in the working tree. + error: Not a valid ref: refs/remotes/origin/main + fatal: ambiguous argument 'refs/remotes/origin/main': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md index f26de4266e..a94ffde80f 100644 --- a/docs/Formula-Cookbook.md +++ b/docs/Formula-Cookbook.md @@ -33,7 +33,7 @@ A *formula* is a package definition written in Ruby. It can be created with `bre Homebrew uses Git for storing formulae and contributing to the project. -As of [Homebrew 4.0.0](https://brew.sh/2023/02/16/homebrew-4.0.0/), formulae are downloaded as JSON from which is automatically regenerated by a scheduled [Homebrew/formulae.brew.sh](https://github.com/Homebrew/formulae.brew.sh) job from the `master` branch of the Homebrew/homebrew-core repository. +As of [Homebrew 4.0.0](https://brew.sh/2023/02/16/homebrew-4.0.0/), formulae are downloaded as JSON from which is automatically regenerated by a scheduled [Homebrew/formulae.brew.sh](https://github.com/Homebrew/formulae.brew.sh) job from the default branch of the Homebrew/homebrew-core repository. Homebrew installs formulae to the Cellar at `$(brew --cellar)` and then symlinks some of the installation into the prefix at `$(brew --prefix)` (e.g. `/opt/homebrew`) so that other programs can see what's going on. We suggest running `brew ls` on a few of the kegs in your Cellar to see how it is all arranged. @@ -322,7 +322,7 @@ Some advice for specific cases: * If the formula is a library, compile and run some simple code that links against it. It could be taken from upstream's documentation / source examples. A good example is [`tinyxml2`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/t/tinyxml2.rb)'s test, which writes a small C++ source file into the test directory, compiles and links it against the tinyxml2 library and finally checks that the resulting program runs successfully. * If the formula is for a GUI program, try to find some function that runs as command-line only, like a format conversion, reading or displaying a config file, etc. * If the software cannot function without credentials or requires a virtual machine, docker instance, etc. to run, a test could be to try to connect with invalid credentials (or without credentials) and confirm that it fails as expected. This is preferred over mocking a dependency. -* Homebrew comes with a number of [standard test fixtures](https://github.com/Homebrew/brew/tree/master/Library/Homebrew/test/support/fixtures), including numerous sample images, sounds, and documents in various formats. You can get the file path to a test fixture with e.g. `test_fixtures("test.svg")`. +* Homebrew comes with a number of [standard test fixtures](https://github.com/Homebrew/brew/tree/HEAD/Library/Homebrew/test/support/fixtures), including numerous sample images, sounds, and documents in various formats. You can get the file path to a test fixture with e.g. `test_fixtures("test.svg")`. * If your test requires a test file that isn't a standard test fixture, you can install it from a source repository during the `test` phase with a [`resource`](https://rubydoc.brew.sh/Formula#resource-class_method) block, like this: ```ruby @@ -402,7 +402,7 @@ brew update # required in more ways than you think (initialises the Homebrew/bre cd "$(brew --repository homebrew/core)" # Create a new git branch for your formula so your pull request is easy to # modify if any changes come up during review. -git checkout -b origin/master +git checkout -b origin/HEAD git add Formula/f/foo.rb git commit ``` @@ -427,7 +427,7 @@ Now you just need to push your commit to GitHub. If you haven’t forked Homebrew yet, [go to the Homebrew/homebrew-core repository and hit the Fork button](https://github.com/Homebrew/homebrew-core). -If you have already forked Homebrew on GitHub, then you can manually push (just make sure you have been pulling from the `Homebrew/homebrew-core` master): +If you have already forked Homebrew on GitHub, then you can manually push (just make sure you have been pulling from the `Homebrew/homebrew-core` default branch): ```sh git push https://github.com/myname/homebrew-core/ @@ -517,7 +517,7 @@ The `std_*_args` methods, as well as the arguments they pass, are: "-o=#{output}" ``` -It also provides a convenient way to set `-ldflags`, `-gcflags`, and `-tags`, see examples: [`babelfish`](https://github.com/Homebrew/homebrew-core/blob/master/Formula/b/babelfish.rb) and [`wazero`](https://github.com/Homebrew/homebrew-core/blob/master/Formula/w/wazero.rb) formulae. +It also provides a convenient way to set `-ldflags`, `-gcflags`, and `-tags`, see examples: [`babelfish`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/b/babelfish.rb) and [`wazero`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/w/wazero.rb) formulae. #### `std_meson_args` @@ -643,7 +643,7 @@ stable do end ``` -Embedded (__END__) patches can be declared like so: +Embedded (**END**) patches can be declared like so: ```ruby patch :DATA @@ -748,7 +748,7 @@ For `url`/`regex` guidelines and additional `livecheck` block examples, refer to ### Unstable versions (`head`) -Formulae can specify an alternate download for the upstream project’s development cutting-edge source (e.g. `master`/`main`/`trunk`) using [`head`](https://rubydoc.brew.sh/Formula#head-class_method), which can be activated by passing `--HEAD` when installing. Specifying it is done in the same manner as [`url`](https://rubydoc.brew.sh/Formula#url-class_method): +Formulae can specify an alternate download for the upstream project’s development cutting-edge source (e.g. `main`/`master`/`trunk`) using [`head`](https://rubydoc.brew.sh/Formula#head-class_method), which can be activated by passing `--HEAD` when installing. Specifying it is done in the same manner as [`url`](https://rubydoc.brew.sh/Formula#url-class_method): ```ruby class Foo < Formula @@ -1296,11 +1296,11 @@ Packages requiring MPI should use [OpenMPI](https://www.open-mpi.org/) by adding Packages requiring BLAS/LAPACK linear algebra interfaces should link to [OpenBLAS](https://www.openblas.net/) by adding `depends_on "openblas"` and (if built with CMake) passing `-DBLA_VENDOR=OpenBLAS` to CMake, rather than Apple's Accelerate framework or the default reference `lapack` implementation. Apple's implementation of BLAS/LAPACK is outdated and may introduce hard-to-debug problems. The reference `lapack` formula is fine, although it is not actively maintained or tuned. -## How to start over (reset to upstream `master`) +## How to start over (reset to upstream) Have you created a real mess in Git which stops you from creating a commit you want to submit to us? You might want to consider starting again from scratch. Your changes to the Homebrew `master` branch can be reset by running: ```sh git checkout -f master -git reset --hard origin/master +git reset --hard origin/HEAD ``` diff --git a/docs/Homebrew-Leadership-Responsibilities.md b/docs/Homebrew-Leadership-Responsibilities.md index e007d29f6e..ae2c472ba8 100644 --- a/docs/Homebrew-Leadership-Responsibilities.md +++ b/docs/Homebrew-Leadership-Responsibilities.md @@ -34,12 +34,12 @@ last_review_date: "1970-01-01" - Ask someone to bring a conference/table microphone for people to be able to remotely participate in AGM - Reconsider current OpenCollective invoice hourly rates based on e.g. inflation - February after the AGM: - - Add the minutes of the AGM to Homebrew/brew's [governance archives](https://github.com/Homebrew/brew/tree/master/docs/governance) + - Add the minutes of the AGM to Homebrew/brew's [governance archives](https://github.com/Homebrew/brew/tree/HEAD/docs/governance) - Create an [issue in Homebrew/brew](https://github.com/Homebrew/brew/issues?q=is%3Aissue+in%3Atitle+membership+) to survey members who did not vote in the election whether they wish to remain or step down as members - Members that are not maintainers should be a least one of: - An current or previously active maintainer, PLC/TSC member or Project Leader - A long-standing member of the Homebrew community (e.g. been submitting good bug reports for over two years) - - After the survey issue is closed, list the current year's members in a new file within the [governance archives](https://github.com/Homebrew/brew/tree/master/docs/governance) + - After the survey issue is closed, list the current year's members in a new file within the [governance archives](https://github.com/Homebrew/brew/tree/HEAD/docs/governance) - October: arrange in-person AGM - Offer to pay for Homebrew maintainers who are at least one of: - active Homebrew maintainers (i.e. not just contributors) diff --git a/docs/Homebrew-brew-Maintainer-Guide.md b/docs/Homebrew-brew-Maintainer-Guide.md index ed60b143df..b02389f256 100644 --- a/docs/Homebrew-brew-Maintainer-Guide.md +++ b/docs/Homebrew-brew-Maintainer-Guide.md @@ -46,7 +46,7 @@ A coverage report is generated by Codecov for every PR, and its results are show Codecov should be used as a guide to indicate when more tests are probably needed, but it's unrealistic for every line of code to have a test associated with it, especially when testing would require a slow integration test. For this reason, it's okay to merge PRs that fail the Codecov check if necessary, but this should be avoided if possible. -CodeCov also monitors CI jobs for every push to `Homebrew/brew` to detect flaky tests and track them over time. The reports are available on [CodeCov](https://app.codecov.io/gh/Homebrew/brew/tests/master). +CodeCov also monitors CI jobs for every push to `Homebrew/brew` to detect flaky tests and track them over time. The reports are available on [CodeCov](https://app.codecov.io/gh/Homebrew/brew/tests/main). CodeCov can be used as a guide to identify which flaky tests are causing the most disruption to the CI suite. To make the biggest improvements to the reliability of the build, we can focus on the most disruptive flaky tests first (i.e. the tests causing the most intermittent failures). diff --git a/docs/Homebrew-homebrew-cask-Maintainer-Guide.md b/docs/Homebrew-homebrew-cask-Maintainer-Guide.md index 078c46f1bf..8bf3ed4d6e 100644 --- a/docs/Homebrew-homebrew-cask-Maintainer-Guide.md +++ b/docs/Homebrew-homebrew-cask-Maintainer-Guide.md @@ -30,4 +30,4 @@ Finally, make sure to thank the contributor for submitting a PR! ## Other Tips -A maintainer can easily rebase a PR onto the latest `master` branch by adding a `/rebase` comment. `BrewTestBot` will automatically rebase the PR and add a reaction to the comment once the rebase is in progress and complete. +A maintainer can easily rebase a PR onto the latest default branch by adding a `/rebase` comment. `BrewTestBot` will automatically rebase the PR and add a reaction to the comment once the rebase is in progress and complete. diff --git a/docs/How-To-Open-a-Homebrew-Pull-Request.md b/docs/How-To-Open-a-Homebrew-Pull-Request.md index 8b0ca8a04b..7f1fe7c5dc 100644 --- a/docs/How-To-Open-a-Homebrew-Pull-Request.md +++ b/docs/How-To-Open-a-Homebrew-Pull-Request.md @@ -104,10 +104,10 @@ To make changes on a new branch and submit it for review, create a GitHub pull r brew update ``` -3. Create a new branch from the latest `master` branch: +3. Create a new branch from the latest default branch: ```sh - git checkout -b origin/master + git checkout -b origin/HEAD ``` 4. Make your changes. For formulae or casks, use `brew edit` or your favourite text editor, using the guidelines in the [Formula Cookbook](Formula-Cookbook.md) or [Cask Cookbook](Cask-Cookbook.md) for reference. diff --git a/docs/Installation.md b/docs/Installation.md index 618925e1bd..32d1c285e9 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -65,7 +65,7 @@ Technically, you can just extract (or `git clone`) Homebrew wherever you want. H **TL;DR: pick another prefix at your peril!** ```sh -mkdir homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip-components 1 -C homebrew +mkdir homebrew && curl -L https://github.com/Homebrew/brew/tarball/main | tar xz --strip-components 1 -C homebrew ``` or: diff --git a/docs/Manpage.md b/docs/Manpage.md index e09f769332..8413248948 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -536,7 +536,7 @@ first search, making that search slower than subsequent ones. ### `developer` \[*`subcommand`*\] Control Homebrew's developer mode. When developer mode is enabled, `brew update` -will update Homebrew to the latest commit on the `master` branch instead of the +will update Homebrew to the latest commit on the `main` branch instead of the latest stable version along with some other behaviour changes. `brew developer` \[`state`\] @@ -3200,7 +3200,7 @@ Run Homebrew's unit and integration tests. `--changed` -: Only runs tests on files that were changed from the master branch. +: Only runs tests on files that were changed from the `main` branch. `--fail-fast` @@ -3370,7 +3370,7 @@ Update the list of GitHub Sponsors in the `Homebrew/brew` README. ### `update-test` \[*`options`*\] Run a test of `brew update` with a new repository clone. If no options are -passed, use `origin/master` as the start commit. +passed, use `origin/main` as the start commit. `--to-tag` diff --git a/docs/New-Maintainer-Checklist.md b/docs/New-Maintainer-Checklist.md index 80ec6acd8a..fc3c95b70a 100644 --- a/docs/New-Maintainer-Checklist.md +++ b/docs/New-Maintainer-Checklist.md @@ -116,7 +116,7 @@ People who are either not eligible or willing to be Homebrew maintainers but hav When admitted as members: - Invite them as a single-channel guest to the #members channel on the [`machomebrew` private Slack](https://machomebrew.slack.com/admin/invites) (and ensure they've read the [communication guidelines](Maintainer-Guidelines.md#communication)) and ask them to use their real name there (rather than a pseudonym they may use on e.g. GitHub). -- Add them to the current year's membership list in the [governance archives](https://github.com/Homebrew/brew/tree/master/docs/governance). +- Add them to the current year's membership list in the [governance archives](https://github.com/Homebrew/brew/tree/HEAD/docs/governance). If they are interested in doing ops/infrastructure/system administration work: diff --git a/docs/Node-for-Formula-Authors.md b/docs/Node-for-Formula-Authors.md index e599e920c9..b549d8b4b8 100644 --- a/docs/Node-for-Formula-Authors.md +++ b/docs/Node-for-Formula-Authors.md @@ -50,7 +50,7 @@ Node modules should be installed to `libexec`. This prevents the Node modules fr In the following we distinguish between two types of Node modules installed using formulae: -- formulae for standard Node modules compatible with npm's global module format which should use [`std_npm_args`](#installing-global-style-modules-with-std_npm_args-to-libexec) (like [`angular-cli`](https://github.com/Homebrew/homebrew-core/blob/master/Formula/a/angular-cli.rb) or [`webpack`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/w/webpack.rb)) +- formulae for standard Node modules compatible with npm's global module format which should use [`std_npm_args`](#installing-global-style-modules-with-std_npm_args-to-libexec) (like [`angular-cli`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/a/angular-cli.rb) or [`webpack`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/w/webpack.rb)) - formulae where the `npm install` call is not the only required install step (e.g. need to also compile non-JavaScript sources) which have to use [`std_npm_args`](#installing-module-dependencies-locally-with-std_npm_args) (like [`emscripten`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/e/emscripten.rb) or [`grunt-cli`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/g/grunt-cli.rb)) What both methods have in common is that they are setting the correct environment for using npm inside Homebrew and are returning the arguments for invoking `npm install` for their specific use cases. This includes fixing an important edge case with the npm cache (caused by Homebrew's redirection of `HOME` during the build and test process) by using our own custom `npm_cache` inside `HOMEBREW_CACHE`, which would otherwise result in very long build times and high disk space usage. diff --git a/docs/README.md b/docs/README.md index 6016f8924a..d9846e02e4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -6,7 +6,7 @@ last_review_date: "1970-01-01" These are the source files for the [Homebrew documentation site](https://docs.brew.sh/). -A [GitHub Action](https://github.com/Homebrew/brew/blob/master/.github/workflows/docs.yml) is run to validate each change before the site is deployed to GitHub Pages. +A [GitHub Action](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/docs.yml) is run to validate each change before the site is deployed to GitHub Pages. ## Usage diff --git a/docs/Releases.md b/docs/Releases.md index e4a39c03f7..d20352279d 100644 --- a/docs/Releases.md +++ b/docs/Releases.md @@ -17,8 +17,8 @@ Since Homebrew 1.0.0 most Homebrew users (those who haven't run a `dev-cmd` or s 2. Ensure that: - no code changes have happened for at least a couple of hours (ideally 4 hours), - at least one Homebrew/homebrew-core pull request CI job has completed successfully, - - the state of the Homebrew/brew `master` CI job is clear (i.e. main jobs green or green after rerunning) - - you are confident there are no major regressions on the current `master` branch. + - the state of the Homebrew/brew `main` CI job is clear (i.e. main jobs green or green after rerunning) + - you are confident there are no major regressions on the current `main` branch. 3. Run `brew release` to create a new draft release. For major or minor version bumps, pass `--major` or `--minor`, respectively. @@ -42,4 +42,4 @@ If this is a major or minor release (e.g. X.0.0 or X.Y.0) then there are a few m - Pros: gets a wider reach and user feedback - Cons: negative comments are common and people take this as a chance to complain about Homebrew (regardless of their usage) -Please do not manually create a release based on older commits on the `master` branch. It's very hard to judge whether these have been sufficiently tested by users or if they will cause negative side effects with the current state of Homebrew/homebrew-core. If a new branch is needed ASAP but there are things on `master` that cannot be released yet (e.g. new deprecations and you want to make a patch release) then revert the relevant PRs, follow the process above and then revert the reverted PRs to reapply them on `master`. +Please do not manually create a release based on older commits on the `main` branch. It's very hard to judge whether these have been sufficiently tested by users or if they will cause negative side effects with the current state of Homebrew/homebrew-core. If a new branch is needed ASAP but there are things on `main` that cannot be released yet (e.g. new deprecations and you want to make a patch release) then revert the relevant PRs, follow the process above and then revert the reverted PRs to reapply them on `main`. diff --git a/docs/Typechecking.md b/docs/Typechecking.md index ea291945a8..6a29bf5341 100644 --- a/docs/Typechecking.md +++ b/docs/Typechecking.md @@ -40,12 +40,12 @@ There are also a very small number of files that Homebrew loads before `sorbet-r ### The [`Library/Homebrew/sorbet`] directory -[`Library/Homebrew/sorbet`]: https://github.com/Homebrew/brew/tree/master/Library/Homebrew/sorbet +[`Library/Homebrew/sorbet`]: https://github.com/Homebrew/brew/tree/HEAD/Library/Homebrew/sorbet The `rbi` directory contains all Ruby Interface (`.rbi`) files auto-generated by running `brew typecheck --update`: - `gems`: RBI files for all gems are generated using [Tapioca](https://github.com/Shopify/tapioca#tapioca). -- `dsl`: RBI files auto-generated by our [Tapioca compilers](https://github.com/Homebrew/brew/tree/master/Library/Homebrew/sorbet/tapioca/compilers). +- `dsl`: RBI files auto-generated by our [Tapioca compilers](https://github.com/Homebrew/brew/tree/HEAD/Library/Homebrew/sorbet/tapioca/compilers). - `upstream.rbi`: This file is manually written and contains temporary workarounds for upstream Sorbet issues. It is typically empty. The `tapioca` directory contains configuration files and compilers for Tapioca, allowing Sorbet to type check the dynamically generated components of the codebase. diff --git a/docs/governance/2019-moss-track-iii-grant-nomination.md b/docs/governance/2019-moss-track-iii-grant-nomination.md index 3c7aeadcd4..56431ad8f6 100644 --- a/docs/governance/2019-moss-track-iii-grant-nomination.md +++ b/docs/governance/2019-moss-track-iii-grant-nomination.md @@ -44,7 +44,7 @@ Homebrew aims to be the missing package manager for macOS (and Linux). Its prima ### What copyright license or licenses cover the project's source code? -Homebrew's code is licensed under a BSD 2-clause license. Homebrew also vendors three dependencies, which are all MIT licensed (). +Homebrew's code is licensed under a BSD 2-clause license. Homebrew also vendors three dependencies, which are all MIT licensed (). ### Does the project contain any proprietary code, or depend on or use a proprietary web service? If so, please give details diff --git a/manpages/brew.1 b/manpages/brew.1 index 8f387e3780..7ced9c7ef3 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -334,7 +334,7 @@ Treat all named arguments as formulae\. \fB\-\-cask\fP Treat all named arguments as casks\. .SS "\fBdeveloper\fP \fR[\fIsubcommand\fP]" -Control Homebrew\[u2019]s developer mode\. When developer mode is enabled, \fBbrew update\fP will update Homebrew to the latest commit on the \fBmaster\fP branch instead of the latest stable version along with some other behaviour changes\. +Control Homebrew\[u2019]s developer mode\. When developer mode is enabled, \fBbrew update\fP will update Homebrew to the latest commit on the \fBmain\fP branch instead of the latest stable version along with some other behaviour changes\. .TP \fBbrew developer\fP [\fBstate\fP] Display the current state of Homebrew\[u2019]s developer mode\. @@ -2031,7 +2031,7 @@ Include tests that use the GitHub API and tests that use any of the taps for off Enable debugging using \fBruby/debug\fP, or surface the standard \fBodebug\fP output\. .TP \fB\-\-changed\fP -Only runs tests on files that were changed from the master branch\. +Only runs tests on files that were changed from the \fBmain\fP branch\. .TP \fB\-\-fail\-fast\fP Exit early on the first failing test\. @@ -2143,7 +2143,7 @@ Exclude these packages when finding resources\. .SS "\fBupdate\-sponsors\fP" Update the list of GitHub Sponsors in the \fBHomebrew/brew\fP README\. .SS "\fBupdate\-test\fP \fR[\fIoptions\fP]" -Run a test of \fBbrew update\fP with a new repository clone\. If no options are passed, use \fBorigin/master\fP as the start commit\. +Run a test of \fBbrew update\fP with a new repository clone\. If no options are passed, use \fBorigin/main\fP as the start commit\. .TP \fB\-\-to\-tag\fP Set \fB$HOMEBREW_UPDATE_TO_TAG\fP to test updating between tags\.