ci: Pin MacPorts version to 2.9.3.

macdice · macdice · commit 64c39bd5047e · 2024-07-25T14:48:01.000+12:00
Commit d01ce18 invented a new way to find the latest MacPorts version. By bad luck, a new beta release has just been published, and it seems to lack some packages we need. Go back to searching for this specific version for now. We still search with a pattern so that we can find the package for the running version of macOS, but for now we always look for 2.9.3. The code to do that had been anticipated already in a commented out line, I just didn't expect to have to use it so soon... Also include the whole MacPorts installation script in the cache key, so that changes to the script cause a fresh installation. This should make it a bit easier to reason about the effect of changes on cached state in github accounts using CI, when we make adjustments. Back-patch to 15, like d01ce18. Discussion: https://postgr.es/m/CA%2BhUKGLqJdv6RcwyZ_0H7khxtLTNJyuK%2BvDFzv3uwYbn8hKH6A%40mail.gmail.com
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
@@ -466,6 +466,8 @@ task:
       # Include the OS major version in the cache key.  If the OS image changes
       # to a different major version, we need to reinstall.
       sw_vers -productVersion | sed 's/\..*//'
+      # Also start afresh if we change our MacPorts install script.
+      md5 src/tools/ci/ci_macports_packages.sh
     reupload_on_changes: true
   setup_additional_packages_script: |
     sh src/tools/ci/ci_macports_packages.sh \
diff --git a/src/tools/ci/ci_macports_packages.sh b/src/tools/ci/ci_macports_packages.sh
@@ -16,13 +16,10 @@ packages="$@"
 macos_major_version="` sw_vers -productVersion | sed 's/\..*//' `"
 echo "macOS major version: $macos_major_version"
 
-# Scan the avialable MacPorts releases to find the latest one for the
-# running macOS release.  By default we assume the first match is the most
-# recent MacPorts version but that can be changed below if it turns out to be
-# problematic or a particular MacPorts release turns out to be broken.
+# Scan the available MacPorts releases to find one that matches the running
+# macOS release.
 macports_release_list_url="https://api.github.com/repos/macports/macports-base/releases"
-macports_version_pattern=".*"
-#macports_version_pattern="2\.9\.3"
+macports_version_pattern="2\.9\.3"
 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 )"
 echo "MacPorts package URL: $macports_url"
 
