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

Commit541f493

Browse files
committed
ci: Pin MacPorts version to 2.9.3.
Commitd01ce18 invented a new way to find the latest MacPorts version.By bad luck, a new beta release has just been published, and it seemsto lack some packages we need. Go back to searching for this specificversion for now. We still search with a pattern so that we can find thepackage for the running version of macOS, but for now we always look for2.9.3. The code to do that had been anticipated already in a commentedout line, I just didn't expect to have to use it so soon...Also include the whole MacPorts installation script in the cache key, sothat changes to the script cause a fresh installation. This should makeit a bit easier to reason about the effect of changes on cached state ingithub accounts using CI, when we make adjustments.Back-patch to 15, liked01ce18.Discussion:https://postgr.es/m/CA%2BhUKGLqJdv6RcwyZ_0H7khxtLTNJyuK%2BvDFzv3uwYbn8hKH6A%40mail.gmail.com
1 parent0151b4d commit541f493

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

‎.cirrus.tasks.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ task:
253253
# Include the OS major version in the cache key. If the OS image changes
254254
# to a different major version, we need to reinstall.
255255
sw_vers -productVersion | sed 's/\..*//'
256+
# Also start afresh if we change our MacPorts install script.
257+
md5 src/tools/ci/ci_macports_packages.sh
256258
reupload_on_changes:true
257259
setup_additional_packages_script:|
258260
sh src/tools/ci/ci_macports_packages.sh \

‎src/tools/ci/ci_macports_packages.sh‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ packages="$@"
1616
macos_major_version="` sw_vers -productVersion| sed's/\..*//'`"
1717
echo"macOS major version:$macos_major_version"
1818

19-
# Scan the avialable MacPorts releases to find the latest one for the
20-
# running macOS release. By default we assume the first match is the most
21-
# recent MacPorts version but that can be changed below if it turns out to be
22-
# problematic or a particular MacPorts release turns out to be broken.
19+
# Scan the available MacPorts releases to find one that matches the running
20+
# macOS release.
2321
macports_release_list_url="https://api.github.com/repos/macports/macports-base/releases"
24-
macports_version_pattern=".*"
25-
#macports_version_pattern="2\.9\.3"
22+
macports_version_pattern="2\.9\.3"
2623
macports_url="$( curl -s$macports_release_list_url| grep"\"https://github.com/macports/macports-base/releases/download/v$macports_version_pattern/MacPorts-$macports_version_pattern-$macos_major_version-[A-Za-z]*\.pkg\""| sed's/.*: "//;s/".*//'| head -1)"
2724
echo"MacPorts package URL:$macports_url"
2825

0 commit comments

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