From 35b4a1a2dda1fd5cc781e29a4223c8c176877f54 Mon Sep 17 00:00:00 2001
From: jolierabideau <jolie_rabideau@sil.org>
Date: Mon, 8 Jun 2026 09:19:15 -0400
Subject: [PATCH 1/2] Goodbye MacOS 12, 13, welcome MacOS 15, 26
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-picked from upstream melusina-org/setup-macports (97cd1a6) to add
macos-26 runner support. Conflicts resolved to keep this fork's
no-caching design; took upstream's macOS version matrix (drop 13, add 26).

Original author: Michaël Le Barbier <michael.le-barbier@melusina.org>

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .github/workflows/continuous-integration.yaml |  6 +--
 README.md                                     | 16 +++----
 configure_macports                            |  4 +-
 identify_self                                 |  8 ++--
 subr/macos.sh                                 |  1 +
 testsuite/modules/macos                       | 44 +++++++++++++++++++
 .../run-testsuite-on-macos-14-package.yaml    | 16 -------
 .../run-testsuite-on-macos-15-local.yaml      |  2 +-
 ...l => run-testsuite-on-macos-26-local.yaml} |  1 +
 9 files changed, 64 insertions(+), 34 deletions(-)
 delete mode 100644 testsuite/run-testsuite-on-macos-14-package.yaml
 rename testsuite/{run-testsuite-on-macos-13-local.yaml => run-testsuite-on-macos-26-local.yaml} (99%)

diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
index b2b19be..560551b 100644
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -11,7 +11,7 @@ jobs:
   run-testsuite:
     strategy:
       matrix:
-        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'macos-15']
+        os: ['ubuntu-latest', 'macos-14', 'macos-15', 'macos-26']
     runs-on: '${{ matrix.os }}'
     name: 'Run Testsuite'
     steps:
@@ -22,11 +22,11 @@ jobs:
   install-macports:
     strategy:
       matrix:
-        os: ['macos-13', 'macos-14', 'macos-15']
+        os: ['macos-14', 'macos-15', 'macos-26']
         version: ['2.11.5']
         prefix: ['local']
         include:
-          - os: 'macos-14'
+          - os: 'macos-15'
             version: '2.11.5'
             prefix: 'package'
     runs-on: '${{ matrix.os }}'
diff --git a/README.md b/README.md
index 8b1e060..9c8afab 100644
--- a/README.md
+++ b/README.md
@@ -81,15 +81,15 @@ on:
   - push
 
 jobs:
-  install-macports-on-macos-13:
-    runs-on: macos-13
-    name: 'Install MacPorts 2.11.5 on MacOS 13'
+  install-macports-on-macos-15:
+    runs-on: macos-15
+    name: 'Install MacPorts 2.11.5 on MacOS 15'
     steps:
       - uses: actions/checkout@v3
       - uses: paranext/setup-macports@v1
         id: 'macports'
         with:
-          parameters: 'testsuite/run-testsuite-on-macos-13.yaml'
+          parameters: 'testsuite/run-testsuite-on-macos-15.yaml'
       - name: 'Validate installed MacPorts version'
         run: >-
           test "$(port version)" = 'Version: 2.11.5'
@@ -100,16 +100,16 @@ jobs:
         run: >-
           test "${{ steps.macports.outputs.version }}" = '2.11.5'
 
-  install-macports-on-macos-14:
-    runs-on: macos-14
-    name: 'Install MacPorts 2.11.5 on MacOS 14'
+  install-macports-on-macos-26:
+    runs-on: macos-26
+    name: 'Install MacPorts 2.11.5 on MacOS 26'
     steps:
       - uses: actions/checkout@v3
       - name: 'Run testsuite'
         run: development/testsuite
       - uses: paranext/setup-macports@v1
         with:
-          parameters: 'testsuite/run-testsuite-on-macos-14.yaml'
+          parameters: 'testsuite/run-testsuite-on-macos-26.yaml'
       - run: port version
 ```
 
diff --git a/configure_macports b/configure_macports
index e5e2a3b..73f92c6 100755
--- a/configure_macports
+++ b/configure_macports
@@ -33,8 +33,8 @@ usage()
 	wlog 'Failure' "$@"
     fi
     cat 1>&2 <<'EOF'
-Usage: install_macports [VERSION-OR-PATHNAME]
- Install MacPorts
+Usage: configure_macports [VERSION-OR-PATHNAME]
+ Configure MacPorts
 EOF
     exit 64
 }
diff --git a/identify_self b/identify_self
index 164e647..34ba690 100755
--- a/identify_self
+++ b/identify_self
@@ -64,7 +64,7 @@ with_group_presentation()
 )
 
 identify_source()
-{
+(
     local head
     git_head()
     (
@@ -74,10 +74,10 @@ identify_source()
     cat <<EOF
 Git HEAD: $(git_head)
 EOF
-}
+)
 
 identify_software()
-{
+(
     yq_version()
     {
 	yq --version | sed -e 's/.*version *//'
@@ -104,7 +104,7 @@ yq: $(yq_version)
 jq: $(jq_version)
 openssl: $(openssl_version)
 EOF
-}
+)
 
 main()
 {
diff --git a/subr/macos.sh b/subr/macos.sh
index 4faaf7c..b4799b8 100644
--- a/subr/macos.sh
+++ b/subr/macos.sh
@@ -42,6 +42,7 @@ known_macos_db()
 13-Ventura
 14-Sonoma
 15-Sequoia
+26-Tahoe
 EOF
 }
 
diff --git a/testsuite/modules/macos b/testsuite/modules/macos
index c04645d..f75c0af 100755
--- a/testsuite/modules/macos
+++ b/testsuite/modules/macos
@@ -81,6 +81,35 @@ EOF
     )
 }
 
+assume_running_on_macos26()
+{
+    system_profiler()
+    (
+	cat <<'EOF'
+Software:
+
+    System Software Overview:
+
+      System Version: macOS 26.0 (25A354)
+      Kernel Version: Darwin 25.0.0
+      Boot Volume: Macintosh HD
+      Boot Mode: Normal
+      Computer Name: Assume.local
+      User Name: runner (runner)
+      Secure Virtual Memory: Enabled
+      System Integrity Protection: Enabled
+      Time since boot: 3 minutes
+EOF
+	exit 0
+    )
+
+    uname()
+    (
+	echo 'Darwin'
+	exit 0
+    )
+}
+
 assume_running_on_linux()
 {
     system_profiler()
@@ -125,6 +154,20 @@ assert_that_macos12_is_detected()
     test "${macosp}" = 'true'
 )
 
+assert_that_macos26_is_detected()
+(
+    assume_running_on_macos26
+    macos=$(probe_macos)
+     if (ensure_macos); then
+	macosp='true'
+    else
+	macosp='false'
+    fi
+    set -e
+    test "${macos}" = 'Tahoe'
+    test "${macosp}" = 'true'
+)
+
 assert_that_linux_is_detected()
 (
     assume_running_on_linux
@@ -142,6 +185,7 @@ assert_that_linux_is_detected()
 testsuite_main\
     assert_that_macos11_is_detected\
     assert_that_macos12_is_detected\
+    assert_that_macos26_is_detected\
     assert_that_linux_is_detected\
 
 # End of file `macos'
diff --git a/testsuite/run-testsuite-on-macos-14-package.yaml b/testsuite/run-testsuite-on-macos-14-package.yaml
deleted file mode 100644
index 68e0d9b..0000000
--- a/testsuite/run-testsuite-on-macos-14-package.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '2.11.5'
-prefix: '/opt/package'
-variants:
-  select:
-    - aqua
-    - metal
-    - python312
-  deselect: x11
-ports:
-  - name: db48
-    deselect: [ java ]
-    select: [ tcl, universal ]
-  - name: gmp
-    select: native
-  - name: dbus
-  - name: curl
diff --git a/testsuite/run-testsuite-on-macos-15-local.yaml b/testsuite/run-testsuite-on-macos-15-local.yaml
index 4a13f76..52ef425 100644
--- a/testsuite/run-testsuite-on-macos-15-local.yaml
+++ b/testsuite/run-testsuite-on-macos-15-local.yaml
@@ -11,4 +11,4 @@ ports:
     select: [ tcl, universal ]
   - name: gmp
     select: native
-  - name: dbus
\ No newline at end of file
+  - name: dbus
diff --git a/testsuite/run-testsuite-on-macos-13-local.yaml b/testsuite/run-testsuite-on-macos-26-local.yaml
similarity index 99%
rename from testsuite/run-testsuite-on-macos-13-local.yaml
rename to testsuite/run-testsuite-on-macos-26-local.yaml
index 52ef425..61e8c79 100644
--- a/testsuite/run-testsuite-on-macos-13-local.yaml
+++ b/testsuite/run-testsuite-on-macos-26-local.yaml
@@ -12,3 +12,4 @@ ports:
   - name: gmp
     select: native
   - name: dbus
+

From c204ab35200be106d0abe4cb080200edfdd146bf Mon Sep 17 00:00:00 2001
From: jolierabideau <jolie_rabideau@sil.org>
Date: Mon, 8 Jun 2026 09:49:18 -0400
Subject: [PATCH 2/2] Bump MacPorts 2.11.5 -> 2.12.5 for current runner images

MacPorts 2.11.5's pkg postinstall scripts fail on the current macOS 15
(Sequoia) and macOS 26 (Tahoe) runner images; 2.11.5 last passed CI on
the Sep-2025 images. 2.12.5 (Apr 2026) post-dates the current images and
ships Sonoma/Sequoia/Tahoe packages. Bump the action default, CI matrix,
testsuite parameters, and docs to keep them aligned.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .github/workflows/continuous-integration.yaml    |  4 ++--
 README.md                                        | 12 ++++++------
 action.yaml                                      |  2 +-
 subr/macports.sh                                 |  2 +-
 testsuite/run-testsuite-on-macos-14-local.yaml   |  2 +-
 testsuite/run-testsuite-on-macos-15-local.yaml   |  2 +-
 testsuite/run-testsuite-on-macos-15-package.yaml |  2 +-
 testsuite/run-testsuite-on-macos-26-local.yaml   |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
index 560551b..00362de 100644
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -23,11 +23,11 @@ jobs:
     strategy:
       matrix:
         os: ['macos-14', 'macos-15', 'macos-26']
-        version: ['2.11.5']
+        version: ['2.12.5']
         prefix: ['local']
         include:
           - os: 'macos-15'
-            version: '2.11.5'
+            version: '2.12.5'
             prefix: 'package'
     runs-on: '${{ matrix.os }}'
     name: 'Install MacPorts'
diff --git a/README.md b/README.md
index 9c8afab..5f405ab 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ to get started with GitHub workflows.
 
 The configuration file is in YAML and has the following format:
 
-* `version: '2.11.5'` — The MacPorts version to install.
+* `version: '2.12.5'` — The MacPorts version to install.
 * `prefix: '/opt/local'` — The installation prefix to install MacPorts to.
   The default is `/opt/local` and only needs to be changed when
   preparing self-install packages for instane.
@@ -83,7 +83,7 @@ on:
 jobs:
   install-macports-on-macos-15:
     runs-on: macos-15
-    name: 'Install MacPorts 2.11.5 on MacOS 15'
+    name: 'Install MacPorts 2.12.5 on MacOS 15'
     steps:
       - uses: actions/checkout@v3
       - uses: paranext/setup-macports@v1
@@ -92,17 +92,17 @@ jobs:
           parameters: 'testsuite/run-testsuite-on-macos-15.yaml'
       - name: 'Validate installed MacPorts version'
         run: >-
-          test "$(port version)" = 'Version: 2.11.5'
+          test "$(port version)" = 'Version: 2.12.5'
       - name: 'Validate transmitted MacPorts prefix'
         run: >-
           test "${{ steps.macports.outputs.prefix }}" = '/opt/local'
       - name: 'Validate transmitted MacPorts version'
         run: >-
-          test "${{ steps.macports.outputs.version }}" = '2.11.5'
+          test "${{ steps.macports.outputs.version }}" = '2.12.5'
 
   install-macports-on-macos-26:
     runs-on: macos-26
-    name: 'Install MacPorts 2.11.5 on MacOS 26'
+    name: 'Install MacPorts 2.12.5 on MacOS 26'
     steps:
       - uses: actions/checkout@v3
       - name: 'Run testsuite'
@@ -117,7 +117,7 @@ jobs:
 ## Example parameters
 
 ```yaml
-version: '2.11.5'
+version: '2.12.5'
 prefix: '/opt/local'
 variants:
   select:
diff --git a/action.yaml b/action.yaml
index b5f5f74..0bf7560 100644
--- a/action.yaml
+++ b/action.yaml
@@ -17,7 +17,7 @@ inputs:
       
       The configuration file is in YAML and has the following format:
 
-        version: '2.11.5'
+        version: '2.12.5'
           The MacPorts version to install.
         prefix: '/opt/local'
           The installation prefix to install MacPortd to.
diff --git a/subr/macports.sh b/subr/macports.sh
index 8e32004..56bedba 100644
--- a/subr/macports.sh
+++ b/subr/macports.sh
@@ -14,7 +14,7 @@
 
 : ${macports_owner:=$(id -u -n)}
 : ${macports_group:=$(id -g -n)}
-: ${macports_version:='2.11.5'}
+: ${macports_version:='2.12.5'}
 : ${macports_prefix:='/opt/local'}
 
 macports_install()
diff --git a/testsuite/run-testsuite-on-macos-14-local.yaml b/testsuite/run-testsuite-on-macos-14-local.yaml
index 61e8c79..f70445d 100644
--- a/testsuite/run-testsuite-on-macos-14-local.yaml
+++ b/testsuite/run-testsuite-on-macos-14-local.yaml
@@ -1,4 +1,4 @@
-version: '2.11.5'
+version: '2.12.5'
 prefix: '/opt/local'
 variants:
   select:
diff --git a/testsuite/run-testsuite-on-macos-15-local.yaml b/testsuite/run-testsuite-on-macos-15-local.yaml
index 52ef425..0a827af 100644
--- a/testsuite/run-testsuite-on-macos-15-local.yaml
+++ b/testsuite/run-testsuite-on-macos-15-local.yaml
@@ -1,4 +1,4 @@
-version: '2.11.5'
+version: '2.12.5'
 prefix: '/opt/local'
 variants:
   select:
diff --git a/testsuite/run-testsuite-on-macos-15-package.yaml b/testsuite/run-testsuite-on-macos-15-package.yaml
index 68e0d9b..181216c 100644
--- a/testsuite/run-testsuite-on-macos-15-package.yaml
+++ b/testsuite/run-testsuite-on-macos-15-package.yaml
@@ -1,4 +1,4 @@
-version: '2.11.5'
+version: '2.12.5'
 prefix: '/opt/package'
 variants:
   select:
diff --git a/testsuite/run-testsuite-on-macos-26-local.yaml b/testsuite/run-testsuite-on-macos-26-local.yaml
index 61e8c79..f70445d 100644
--- a/testsuite/run-testsuite-on-macos-26-local.yaml
+++ b/testsuite/run-testsuite-on-macos-26-local.yaml
@@ -1,4 +1,4 @@
-version: '2.11.5'
+version: '2.12.5'
 prefix: '/opt/local'
 variants:
   select: