Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
run-testsuite:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-13', 'macos-14']
os: ['ubuntu-latest', 'macos-13', 'macos-14', 'macos-15']
runs-on: '${{ matrix.os }}'
name: 'Run Testsuite'
steps:
Expand All @@ -22,12 +22,12 @@ jobs:
install-macports:
strategy:
matrix:
os: ['macos-13', 'macos-14']
version: ['2.9.3']
os: ['macos-13', 'macos-14', 'macos-15']
version: ['2.11.5']
prefix: ['local']
include:
- os: 'macos-14'
version: '2.9.3'
version: '2.11.5'
prefix: 'package'
runs-on: '${{ matrix.os }}'
name: 'Install MacPorts'
Expand All @@ -47,6 +47,7 @@ jobs:
- name: 'Validate transmitted MacPorts prefix'
run: >-
test "${{ steps.macports.outputs.prefix }}" = '/opt/${{ matrix.prefix }}'

- name: 'Validate transmitted MacPorts version'
run: >-
test "${{ steps.macports.outputs.version }}" = '${{ matrix.version }}'
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ to get started with GitHub workflows.

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

* `version: '2.9.3'` — The MacPorts version to install.
* `version: '2.11.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.
Expand Down Expand Up @@ -81,43 +81,43 @@ on:
- push

jobs:
install-macports-on-macos-11:
runs-on: macos-11
name: 'Install MacPorts 2.9.3 on MacOS 11'
install-macports-on-macos-13:
runs-on: macos-13
name: 'Install MacPorts 2.11.5 on MacOS 13'
steps:
- uses: actions/checkout@v3
- uses: paranext/setup-macports@v1
id: 'macports'
with:
parameters: 'testsuite/run-testsuite-on-macos-11.yaml'
parameters: 'testsuite/run-testsuite-on-macos-13.yaml'
- name: 'Validate installed MacPorts version'
run: >-
test "$(port version)" = 'Version: 2.9.3'
test "$(port version)" = 'Version: 2.11.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.9.3'
test "${{ steps.macports.outputs.version }}" = '2.11.5'

install-macports-on-macos-12:
runs-on: macos-12
name: 'Install MacPorts 2.9.3 on MacOS 12'
install-macports-on-macos-14:
runs-on: macos-14
name: 'Install MacPorts 2.11.5 on MacOS 14'
steps:
- uses: actions/checkout@v3
- name: 'Run testsuite'
run: development/testsuite
- uses: paranext/setup-macports@v1
with:
parameters: 'testsuite/run-testsuite-on-macos-12.yaml'
parameters: 'testsuite/run-testsuite-on-macos-14.yaml'
- run: port version
```


## Example parameters

```yaml
version: '2.9.3'
version: '2.11.5'
prefix: '/opt/local'
variants:
select:
Expand Down
2 changes: 1 addition & 1 deletion action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ inputs:

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

version: '2.9.3'
version: '2.11.5'
The MacPorts version to install.
prefix: '/opt/local'
The installation prefix to install MacPortd to.
Expand Down
1 change: 1 addition & 0 deletions subr/macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ known_macos_db()
12-Monterey
13-Ventura
14-Sonoma
15-Sequoia
EOF
}

Expand Down
2 changes: 1 addition & 1 deletion subr/macports.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

: ${macports_owner:=$(id -u -n)}
: ${macports_group:=$(id -g -n)}
: ${macports_version:='2.9.3'}
: ${macports_version:='2.11.5'}
: ${macports_prefix:='/opt/local'}

macports_install()
Expand Down
2 changes: 1 addition & 1 deletion testsuite/run-testsuite-on-macos-13-local.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2.9.3'
version: '2.11.5'
prefix: '/opt/local'
variants:
select:
Expand Down
2 changes: 1 addition & 1 deletion testsuite/run-testsuite-on-macos-14-local.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2.9.3'
version: '2.11.5'
prefix: '/opt/local'
variants:
select:
Expand Down
2 changes: 1 addition & 1 deletion testsuite/run-testsuite-on-macos-14-package.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2.9.3'
version: '2.11.5'
prefix: '/opt/package'
variants:
select:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2.9.3'
version: '2.11.5'
prefix: '/opt/local'
variants:
select:
Expand All @@ -11,4 +11,4 @@ ports:
select: [ tcl, universal ]
- name: gmp
select: native
- name: dbus
- name: dbus
16 changes: 16 additions & 0 deletions testsuite/run-testsuite-on-macos-15-package.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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