From 386122dc5852dcf2d2d070edc59ae162bd003e17 Mon Sep 17 00:00:00 2001 From: jolierabideau Date: Fri, 19 Sep 2025 09:05:51 -0400 Subject: [PATCH 1/5] Add macos 15 and test suites for macos 15 --- .github/workflows/continuous-integration.yaml | 4 ++-- subr/macos.sh | 1 + testsuite/run-testsuite-on-macos-15-local.yaml | 14 ++++++++++++++ testsuite/run-testsuite-on-macos-15-package.yaml | 16 ++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 testsuite/run-testsuite-on-macos-15-local.yaml create mode 100644 testsuite/run-testsuite-on-macos-15-package.yaml diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 18cdf1d..71a7403 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'] + os: ['ubuntu-latest', 'macos-13', 'macos-14', 'macos-15'] runs-on: '${{ matrix.os }}' name: 'Run Testsuite' steps: @@ -22,7 +22,7 @@ jobs: install-macports: strategy: matrix: - os: ['macos-13', 'macos-14'] + os: ['macos-13', 'macos-14', 'macos-15'] version: ['2.9.3'] prefix: ['local'] include: diff --git a/subr/macos.sh b/subr/macos.sh index 99f34ce..4faaf7c 100644 --- a/subr/macos.sh +++ b/subr/macos.sh @@ -41,6 +41,7 @@ known_macos_db() 12-Monterey 13-Ventura 14-Sonoma +15-Sequoia EOF } diff --git a/testsuite/run-testsuite-on-macos-15-local.yaml b/testsuite/run-testsuite-on-macos-15-local.yaml new file mode 100644 index 0000000..af04727 --- /dev/null +++ b/testsuite/run-testsuite-on-macos-15-local.yaml @@ -0,0 +1,14 @@ +version: '2.9.3' +prefix: '/opt/local' +variants: + select: + - aqua + - metal + deselect: x11 +ports: + - name: db48 + deselect: [ java ] + select: [ tcl, universal ] + - name: gmp + select: native + - name: dbus \ No newline at end of file diff --git a/testsuite/run-testsuite-on-macos-15-package.yaml b/testsuite/run-testsuite-on-macos-15-package.yaml new file mode 100644 index 0000000..166d40c --- /dev/null +++ b/testsuite/run-testsuite-on-macos-15-package.yaml @@ -0,0 +1,16 @@ +version: '2.9.3' +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 From a779e3b59dfc7bbee92a62ce17e313871ae13090 Mon Sep 17 00:00:00 2001 From: jolierabideau Date: Fri, 19 Sep 2025 09:18:08 -0400 Subject: [PATCH 2/5] upgrade validate macports version step --- .github/workflows/continuous-integration.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 71a7403..5da37bc 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -41,8 +41,7 @@ jobs: parameters: 'testsuite/run-testsuite-on-${{ matrix.os }}-${{ matrix.prefix }}.yaml' - name: 'Validate installed MacPorts version' - run: >- - test "$(port version)" = 'Version: ${{ matrix.version }}' + run: port version | grep -q 'Version: ${{ matrix.version }}' - name: 'Validate transmitted MacPorts prefix' run: >- From 5f4631194d9416053785ec788a68635776909c6c Mon Sep 17 00:00:00 2001 From: jolierabideau Date: Fri, 19 Sep 2025 09:22:57 -0400 Subject: [PATCH 3/5] Support macports 2.11.5 --- .github/workflows/continuous-integration.yaml | 4 ++-- README.md | 24 +++++++++---------- action.yaml | 2 +- subr/macports.sh | 2 +- .../run-testsuite-on-macos-12-local.yaml | 14 ----------- .../run-testsuite-on-macos-13-local.yaml | 2 +- .../run-testsuite-on-macos-14-local.yaml | 2 +- .../run-testsuite-on-macos-14-package.yaml | 2 +- .../run-testsuite-on-macos-15-local.yaml | 2 +- .../run-testsuite-on-macos-15-package.yaml | 2 +- 10 files changed, 21 insertions(+), 35 deletions(-) delete mode 100644 testsuite/run-testsuite-on-macos-12-local.yaml diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 5da37bc..0a8cbf8 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -23,11 +23,11 @@ jobs: strategy: matrix: os: ['macos-13', 'macos-14', 'macos-15'] - version: ['2.9.3'] + 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' diff --git a/README.md b/README.md index 2671b40..8b1e060 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.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. @@ -81,35 +81,35 @@ 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 ``` @@ -117,7 +117,7 @@ jobs: ## Example parameters ```yaml -version: '2.9.3' +version: '2.11.5' prefix: '/opt/local' variants: select: diff --git a/action.yaml b/action.yaml index 2b22ae0..b5f5f74 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.9.3' + version: '2.11.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 f52494d..8e32004 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.9.3'} +: ${macports_version:='2.11.5'} : ${macports_prefix:='/opt/local'} macports_install() diff --git a/testsuite/run-testsuite-on-macos-12-local.yaml b/testsuite/run-testsuite-on-macos-12-local.yaml deleted file mode 100644 index 98f96bc..0000000 --- a/testsuite/run-testsuite-on-macos-12-local.yaml +++ /dev/null @@ -1,14 +0,0 @@ -version: '2.9.3' -prefix: '/opt/local' -variants: - select: - - aqua - - metal - deselect: x11 -ports: - - name: db48 - deselect: [ java ] - select: [ tcl, universal ] - - name: gmp - select: native - - name: dbus diff --git a/testsuite/run-testsuite-on-macos-13-local.yaml b/testsuite/run-testsuite-on-macos-13-local.yaml index 98f96bc..52ef425 100644 --- a/testsuite/run-testsuite-on-macos-13-local.yaml +++ b/testsuite/run-testsuite-on-macos-13-local.yaml @@ -1,4 +1,4 @@ -version: '2.9.3' +version: '2.11.5' prefix: '/opt/local' variants: select: diff --git a/testsuite/run-testsuite-on-macos-14-local.yaml b/testsuite/run-testsuite-on-macos-14-local.yaml index 45590cb..61e8c79 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.9.3' +version: '2.11.5' prefix: '/opt/local' variants: select: diff --git a/testsuite/run-testsuite-on-macos-14-package.yaml b/testsuite/run-testsuite-on-macos-14-package.yaml index 166d40c..68e0d9b 100644 --- a/testsuite/run-testsuite-on-macos-14-package.yaml +++ b/testsuite/run-testsuite-on-macos-14-package.yaml @@ -1,4 +1,4 @@ -version: '2.9.3' +version: '2.11.5' prefix: '/opt/package' variants: select: diff --git a/testsuite/run-testsuite-on-macos-15-local.yaml b/testsuite/run-testsuite-on-macos-15-local.yaml index af04727..4a13f76 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.9.3' +version: '2.11.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 166d40c..68e0d9b 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.9.3' +version: '2.11.5' prefix: '/opt/package' variants: select: From 92ac148d7624e851bfb7c81ac7f3494bbdbbb78d Mon Sep 17 00:00:00 2001 From: jolierabideau Date: Fri, 19 Sep 2025 10:17:45 -0400 Subject: [PATCH 4/5] Fix typo on validate macports version step --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 0a8cbf8..cec72d1 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -41,7 +41,7 @@ jobs: parameters: 'testsuite/run-testsuite-on-${{ matrix.os }}-${{ matrix.prefix }}.yaml' - name: 'Validate installed MacPorts version' - run: port version | grep -q 'Version: ${{ matrix.version }}' + run: port version | grep -q "Version: ${{ matrix.version }}" - name: 'Validate transmitted MacPorts prefix' run: >- From bb3bc9e01517e9662120e62178fef1226ec14962 Mon Sep 17 00:00:00 2001 From: jolierabideau Date: Fri, 19 Sep 2025 10:20:11 -0400 Subject: [PATCH 5/5] Replace version step --- .github/workflows/continuous-integration.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index cec72d1..b2b19be 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -41,11 +41,13 @@ jobs: parameters: 'testsuite/run-testsuite-on-${{ matrix.os }}-${{ matrix.prefix }}.yaml' - name: 'Validate installed MacPorts version' - run: port version | grep -q "Version: ${{ matrix.version }}" + run: >- + test "$(port version)" = 'Version: ${{ matrix.version }}' - 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 }}'