Skip to content

Commit 97cd1a6

Browse files
Goodbye MacOS 12, 13, welcome MacOS 15, 26
1 parent 7a57259 commit 97cd1a6

12 files changed

+77
-29
lines changed

.github/workflows/continuous-integration.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
run-testsuite:
1212
strategy:
1313
matrix:
14-
os: ['ubuntu-latest', 'macos-13', 'macos-14']
14+
os: ['ubuntu-latest', 'macos-14', 'macos-15', 'macos-26']
1515
runs-on: '${{ matrix.os }}'
1616
name: 'Run Testsuite'
1717
steps:
@@ -22,12 +22,12 @@ jobs:
2222
install-macports:
2323
strategy:
2424
matrix:
25-
os: ['macos-13', 'macos-14']
26-
version: ['2.9.3']
25+
os: ['macos-14', 'macos-15', 'macos-26']
26+
version: ['2.11.5']
2727
prefix: ['local']
2828
include:
29-
- os: 'macos-14'
30-
version: '2.9.3'
29+
- os: 'macos-15'
30+
version: '2.11.5'
3131
prefix: 'package'
3232
runs-on: '${{ matrix.os }}'
3333
name: 'Install MacPorts'

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ to get started with GitHub workflows.
4040

4141
The configuration file is in YAML and has the following format:
4242

43-
* `version: '2.9.3'` — The MacPorts version to install.
43+
* `version: '2.11.5'` — The MacPorts version to install.
4444
* `prefix: '/opt/local'` — The installation prefix to install MacPorts to.
4545
The default is `/opt/local` and only needs to be changed when
4646
preparing self-install packages for instane.
@@ -79,43 +79,43 @@ on:
7979
- push
8080

8181
jobs:
82-
install-macports-on-macos-11:
83-
runs-on: macos-11
84-
name: 'Install MacPorts 2.9.3 on MacOS 11'
82+
install-macports-on-macos-15:
83+
runs-on: macos-15
84+
name: 'Install MacPorts 2.11.5 on MacOS 15'
8585
steps:
8686
- uses: actions/checkout@v3
8787
- uses: melusina-org/setup-macports@v1
8888
id: 'macports'
8989
with:
90-
parameters: 'testsuite/run-testsuite-on-macos-11.yaml'
90+
parameters: 'testsuite/run-testsuite-on-macos-15.yaml'
9191
- name: 'Validate installed MacPorts version'
9292
run: >-
93-
test "$(port version)" = 'Version: 2.9.3'
93+
test "$(port version)" = 'Version: 2.11.5'
9494
- name: 'Validate transmitted MacPorts prefix'
9595
run: >-
9696
test "${{ steps.macports.outputs.prefix }}" = '/opt/local'
9797
- name: 'Validate transmitted MacPorts version'
9898
run: >-
99-
test "${{ steps.macports.outputs.version }}" = '2.9.3'
99+
test "${{ steps.macports.outputs.version }}" = '2.11.5'
100100
101-
install-macports-on-macos-12:
102-
runs-on: macos-12
103-
name: 'Install MacPorts 2.9.3 on MacOS 12'
101+
install-macports-on-macos-26:
102+
runs-on: macos-26
103+
name: 'Install MacPorts 2.11.5 on MacOS 26'
104104
steps:
105105
- uses: actions/checkout@v3
106106
- name: 'Run testsuite'
107107
run: development/testsuite
108108
- uses: melusina-org/setup-macports@v1
109109
with:
110-
parameters: 'testsuite/run-testsuite-on-macos-12.yaml'
110+
parameters: 'testsuite/run-testsuite-on-macos-26.yaml'
111111
- run: port version
112112
```
113113
114114
115115
## Example parameters
116116
117117
```yaml
118-
version: '2.9.3'
118+
version: '2.11.5'
119119
prefix: '/opt/local'
120120
variants:
121121
select:

action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ inputs:
1717
1818
The configuration file is in YAML and has the following format:
1919
20-
version: '2.9.3'
20+
version: '2.11.5'
2121
The MacPorts version to install.
2222
prefix: '/opt/local'
2323
The installation prefix to install MacPortd to.

configure_macports

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ usage()
3232
wlog 'Failure' "$@"
3333
fi
3434
cat 1>&2 <<'EOF'
35-
Usage: install_macports [VERSION-OR-PATHNAME]
36-
Install MacPorts
35+
Usage: configure_macports [VERSION-OR-PATHNAME]
36+
Configure MacPorts
3737
EOF
3838
exit 64
3939
}

identify_self

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ with_group_presentation()
6363
)
6464

6565
identify_source()
66-
{
66+
(
6767
local head
6868
git_head()
6969
(
@@ -73,10 +73,10 @@ identify_source()
7373
cat <<EOF
7474
Git HEAD: $(git_head)
7575
EOF
76-
}
76+
)
7777

7878
identify_software()
79-
{
79+
(
8080
yq_version()
8181
{
8282
yq --version | sed -e 's/.*version *//'
@@ -103,7 +103,7 @@ yq: $(yq_version)
103103
jq: $(jq_version)
104104
openssl: $(openssl_version)
105105
EOF
106-
}
106+
)
107107

108108
main()
109109
{

subr/macos.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ known_macos_db()
4040
12-Monterey
4141
13-Ventura
4242
14-Sonoma
43+
15-Sequoia
44+
26-Tahoe
4345
EOF
4446
}
4547

subr/macports.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
: ${macports_owner:=$(id -u -n)}
1515
: ${macports_group:=$(id -g -n)}
16-
: ${macports_version:='2.9.3'}
16+
: ${macports_version:='2.11.5'}
1717
: ${macports_prefix:='/opt/local'}
1818

1919
macports_install()

testsuite/modules/macos

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,35 @@ EOF
8080
)
8181
}
8282

83+
assume_running_on_macos26()
84+
{
85+
system_profiler()
86+
(
87+
cat <<'EOF'
88+
Software:
89+
90+
System Software Overview:
91+
92+
System Version: macOS 26.0 (25A354)
93+
Kernel Version: Darwin 25.0.0
94+
Boot Volume: Macintosh HD
95+
Boot Mode: Normal
96+
Computer Name: Assume.local
97+
User Name: runner (runner)
98+
Secure Virtual Memory: Enabled
99+
System Integrity Protection: Enabled
100+
Time since boot: 3 minutes
101+
EOF
102+
exit 0
103+
)
104+
105+
uname()
106+
(
107+
echo 'Darwin'
108+
exit 0
109+
)
110+
}
111+
83112
assume_running_on_linux()
84113
{
85114
system_profiler()
@@ -124,6 +153,20 @@ assert_that_macos12_is_detected()
124153
test "${macosp}" = 'true'
125154
)
126155

156+
assert_that_macos26_is_detected()
157+
(
158+
assume_running_on_macos26
159+
macos=$(probe_macos)
160+
if (ensure_macos); then
161+
macosp='true'
162+
else
163+
macosp='false'
164+
fi
165+
set -e
166+
test "${macos}" = 'Tahoe'
167+
test "${macosp}" = 'true'
168+
)
169+
127170
assert_that_linux_is_detected()
128171
(
129172
assume_running_on_linux
@@ -141,6 +184,7 @@ assert_that_linux_is_detected()
141184
testsuite_main\
142185
assert_that_macos11_is_detected\
143186
assert_that_macos12_is_detected\
187+
assert_that_macos26_is_detected\
144188
assert_that_linux_is_detected\
145189

146190
# End of file `macos'

testsuite/run-testsuite-on-macos-14-local.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2.9.3'
1+
version: '2.11.5'
22
prefix: '/opt/local'
33
variants:
44
select:

testsuite/run-testsuite-on-macos-12-local.yaml renamed to testsuite/run-testsuite-on-macos-15-local.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2.9.3'
1+
version: '2.11.5'
22
prefix: '/opt/local'
33
variants:
44
select:
@@ -12,3 +12,4 @@ ports:
1212
- name: gmp
1313
select: native
1414
- name: dbus
15+

0 commit comments

Comments
 (0)