Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbbcc41e

Browse files
authored
Merge pull request#936 from asmorkalov:as/mac_intel_update
Mac Intel refresh
2 parentsea3538a +1e1b0ca commitbbcc41e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎.github/workflows/build_wheels_macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020

2121
jobs:
2222
Build:
23-
runs-on:macos-11
23+
runs-on:macos-12
2424
defaults:
2525
run:
2626
shell:bash
@@ -98,7 +98,7 @@ jobs:
9898

9999
Test:
100100
needs:[Build]
101-
runs-on:macos-11
101+
runs-on:macos-12
102102
defaults:
103103
run:
104104
shell:bash

‎travis_osx_brew_cache.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,14 @@ function _brew_parse_bottle_json {
265265

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

268-
local JSON_DATA; JSON_DATA=$(python2.7 -c'if True:
268+
local JSON_DATA; JSON_DATA=$(python3 -c'if True:
269269
import sys,json; j=json.load(open(sys.argv[1],"rb")); [name]=j.keys(); [pdata]=j.values()
270-
printname
271-
printpdata["formula"]["pkg_version"]
272-
printpdata["bottle"]["rebuild"]
270+
print(name)
271+
print(pdata["formula"]["pkg_version"])
272+
print(pdata["bottle"]["rebuild"])
273273
[(tag_name, tag_dict)]=pdata["bottle"]["tags"].items()
274-
printtag_name
275-
printtag_dict["sha256"]
274+
print(tag_name)
275+
print(tag_dict["sha256"])
276276
'"$JSON")
277277

278278
unset JSON
@@ -292,15 +292,15 @@ function _brew_parse_package_info {
292292
PACKAGE="${1:?}";shift
293293
OS_CODENAME="${1:?}";shift
294294

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp