Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mac Intel refresh #936

Merged
merged 1 commit into from
Dec 27, 2023
Merged

Mac Intel refresh #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

jobs:
Build:
runs-on: macos-11
runs-on: macos-12
defaults:
run:
shell: bash
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:

Test:
needs: [Build]
runs-on: macos-11
runs-on: macos-12
defaults:
run:
shell: bash
Expand Down
20 changes: 10 additions & 10 deletions travis_osx_brew_cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,14 @@ function _brew_parse_bottle_json {

local JSON; JSON="${1:?}"; shift

local JSON_DATA; JSON_DATA=$(python2.7 -c 'if True:
local JSON_DATA; JSON_DATA=$(python3 -c 'if True:
import sys,json; j=json.load(open(sys.argv[1],"rb")); [name]=j.keys(); [pdata]=j.values()
print name
print pdata["formula"]["pkg_version"]
print pdata["bottle"]["rebuild"]
print(name)
print(pdata["formula"]["pkg_version"])
print(pdata["bottle"]["rebuild"])
[(tag_name, tag_dict)]=pdata["bottle"]["tags"].items()
print tag_name
print tag_dict["sha256"]
print(tag_name)
print(tag_dict["sha256"])
' "$JSON")

unset JSON
Expand All @@ -292,15 +292,15 @@ function _brew_parse_package_info {
PACKAGE="${1:?}"; shift
OS_CODENAME="${1:?}"; shift

local JSON_DATA; JSON_DATA=$(python2.7 -c 'if True:
local JSON_DATA; JSON_DATA=$(python3 -c 'if True:
import sys, json, subprocess; j=json.loads(subprocess.check_output(("brew","info","--json=v1",sys.argv[1])))
data=j[0]
revision=data["revision"]
# in bottle''s json, revision is included into version; here, they are separate
print data["versions"]["stable"]+("_"+str(revision) if revision else "")
print(data["versions"]["stable"]+("_"+str(revision) if revision else ""))
bottle_data=data["bottle"].get("stable",{"rebuild":"","files":{}})
print bottle_data["rebuild"]
print bottle_data["files"].get(sys.argv[2],{"sha256":"!?"})["sha256"] #prevent losing trailing blank line to command substitution
print(bottle_data["rebuild"])
print(bottle_data["files"].get(sys.argv[2],{"sha256":"!?"})["sha256"]) #prevent losing trailing blank line to command substitution
' \
"$PACKAGE" "$OS_CODENAME"); JSON_DATA="${JSON_DATA%\!\?}" #!? can't occur in a hash

Expand Down
Loading