admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #15647 from Bo98/update-fix

Browse Source 
cmd/update: adjustments for setup-homebrew in brew CI
This commit is contained in:
Bo Anderson 2023-07-07 20:53:04 +01:00 committed by GitHub
commit cf180bbc96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/update.sh
View File

@ -613,6 +613,11 @@ EOS
declare UPSTREAM_BRANCH"${TAP_VAR}"="${UPSTREAM_BRANCH_DIR}" declare UPSTREAM_BRANCH"${TAP_VAR}"="${UPSTREAM_BRANCH_DIR}"
declare PREFETCH_REVISION"${TAP_VAR}"="$(git rev-parse -q --verify refs/remotes/origin/"${UPSTREAM_BRANCH_DIR}")" declare PREFETCH_REVISION"${TAP_VAR}"="$(git rev-parse -q --verify refs/remotes/origin/"${UPSTREAM_BRANCH_DIR}")"
if [[ -n "${GITHUB_ACTIONS}" && -n "${HOMEBREW_UPDATE_SKIP_BREW}" && "${DIR}" == "${HOMEBREW_REPOSITORY}" ]]
then
continue
fi
# Force a full update if we don't have any tags. # Force a full update if we don't have any tags.
if [[ "${DIR}" == "${HOMEBREW_REPOSITORY}" && -z "$(git tag --list)" ]] if [[ "${DIR}" == "${HOMEBREW_REPOSITORY}" && -z "$(git tag --list)" ]]
then then
@ -767,9 +772,10 @@ EOS
if [[ -n "${HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH}" ]] if [[ -n "${HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH}" ]]
then then
simulate_from_current_branch "${DIR}" "${TAP_VAR}" "${UPSTREAM_BRANCH}" "${CURRENT_REVISION}" simulate_from_current_branch "${DIR}" "${TAP_VAR}" "${UPSTREAM_BRANCH}" "${CURRENT_REVISION}"
elif [[ -z "${HOMEBREW_UPDATE_FORCE}" ]] && elif [[ -z "${HOMEBREW_UPDATE_FORCE}" &&
[[ "${PREFETCH_REVISION}" == "${POSTFETCH_REVISION}" ]] && "${PREFETCH_REVISION}" == "${POSTFETCH_REVISION}" &&
[[ "${CURRENT_REVISION}" == "${POSTFETCH_REVISION}" ]] "${CURRENT_REVISION}" == "${POSTFETCH_REVISION}" ]] ||
[[ -n "${GITHUB_ACTIONS}" && -n "${HOMEBREW_UPDATE_SKIP_BREW}" && "${DIR}" == "${HOMEBREW_REPOSITORY}" ]]
then then
export HOMEBREW_UPDATE_BEFORE"${TAP_VAR}"="${CURRENT_REVISION}" export HOMEBREW_UPDATE_BEFORE"${TAP_VAR}"="${CURRENT_REVISION}"
export HOMEBREW_UPDATE_AFTER"${TAP_VAR}"="${CURRENT_REVISION}" export HOMEBREW_UPDATE_AFTER"${TAP_VAR}"="${CURRENT_REVISION}"

1
Library/Homebrew/test/formulary_spec.rb
View File

@ -346,7 +346,6 @@ describe Formulary do
else else
expect(formula.deps.count).to eq 6 expect(formula.deps.count).to eq 6
end end
expect(formula.uses_from_macos_elements).to eq ["uses_from_macos_dep"]
expect(formula.requirements.count).to eq 1 expect(formula.requirements.count).to eq 1
req = formula.requirements.first req = formula.requirements.first

4
Library/Homebrew/test/os/mac/formula_spec.rb
View File

@ -23,8 +23,6 @@ describe Formula do
expect(f.class.head.declared_deps).not_to be_empty expect(f.class.head.declared_deps).not_to be_empty
expect(f.class.stable.declared_deps.first.name).to eq("foo") expect(f.class.stable.declared_deps.first.name).to eq("foo")
expect(f.class.head.declared_deps.first.name).to eq("foo") expect(f.class.head.declared_deps.first.name).to eq("foo")
expect(f.class.stable.uses_from_macos_elements.first).to eq("foo")
expect(f.class.head.uses_from_macos_elements.first).to eq("foo")
end end
it "adds a dependency to any spec if the OS version doesn't meet requirements" do it "adds a dependency to any spec if the OS version doesn't meet requirements" do
@ -40,8 +38,6 @@ describe Formula do
expect(f.class.head.deps.first.name).to eq("foo") expect(f.class.head.deps.first.name).to eq("foo")
expect(f.class.stable.declared_deps).not_to be_empty expect(f.class.stable.declared_deps).not_to be_empty
expect(f.class.head.declared_deps).not_to be_empty expect(f.class.head.declared_deps).not_to be_empty
expect(f.class.stable.uses_from_macos_elements).to eq(["foo"])
expect(f.class.head.uses_from_macos_elements).to eq(["foo"])
end end
end end

2
Library/Homebrew/test/software_spec_spec.rb
View File

@ -208,7 +208,6 @@ describe SoftwareSpec do
expect(spec.declared_deps).not_to be_empty expect(spec.declared_deps).not_to be_empty
expect(spec.declared_deps.first).to be_uses_from_macos expect(spec.declared_deps.first).to be_uses_from_macos
expect(spec.declared_deps.first).to be_use_macos_install expect(spec.declared_deps.first).to be_use_macos_install
expect(spec.uses_from_macos_elements.first).to eq("foo")
end end
it "add a macOS dependency if the OS version doesn't meet requirements" do it "add a macOS dependency if the OS version doesn't meet requirements" do
@ -219,7 +218,6 @@ describe SoftwareSpec do
expect(spec.deps.first.name).to eq("foo") expect(spec.deps.first.name).to eq("foo")
expect(spec.deps.first).to be_uses_from_macos expect(spec.deps.first).to be_uses_from_macos
expect(spec.deps.first).not_to be_use_macos_install expect(spec.deps.first).not_to be_use_macos_install
expect(spec.uses_from_macos_elements).to eq(["foo"])
end end
it "works with tags" do it "works with tags" do