diff --git a/LICENSE b/LICENSE index ec3712f..c431499 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2022 Melusina +Copyright (c) 2022 Melusina (original author) +Copyright (c) 2025 SIL Global and United Bible Societies (subsequent changes) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 67922d8..2671b40 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ # Setup MacPorts on GitHub Runners +**NOTE: This is a fork of the original [melusina-org/setup-macports](https://github.com/melusina-org/setup-macports) repository.** + This GitHub Action configure and installs MacPorts. It supports the selection and deselection of port variants, the use of supplementary port definitions sources, the installation of additional ports and the caching of an installation. -[![Continuous Integration](https://github.com/melusina-org/setup-macports/actions/workflows/continuous-integration.yaml/badge.svg?branch=main)](https://github.com/melusina-org/setup-macports/actions/workflows/continuous-integration.yaml) +[![Continuous Integration](https://github.com/paranext/setup-macports/actions/workflows/continuous-integration.yaml/badge.svg?branch=main)](https://github.com/paranext/setup-macports/actions/workflows/continuous-integration.yaml) ## Usage @@ -84,7 +86,7 @@ jobs: name: 'Install MacPorts 2.9.3 on MacOS 11' steps: - uses: actions/checkout@v3 - - uses: melusina-org/setup-macports@v1 + - uses: paranext/setup-macports@v1 id: 'macports' with: parameters: 'testsuite/run-testsuite-on-macos-11.yaml' @@ -105,7 +107,7 @@ jobs: - uses: actions/checkout@v3 - name: 'Run testsuite' run: development/testsuite - - uses: melusina-org/setup-macports@v1 + - uses: paranext/setup-macports@v1 with: parameters: 'testsuite/run-testsuite-on-macos-12.yaml' - run: port version @@ -133,4 +135,17 @@ ports: ## License -The scripts and documentation in this project are released under the [MIT License](LICENSE) + +The scripts and documentation in this project are released under the [MIT License](LICENSE). + +**Copyright Information:** +- Original code: Copyright © 2022–2023 Michaël Le Barbier +- Subsequent changes: Copyright © 2025 SIL Global and United Bible Societies + +## Changes in this Fork + +This fork removes all Lisp dependencies and related development tooling that were present in the original repository: +- Removed all Common Lisp code and ASDF system definitions +- Removed Lisp-based linting functionality +- Updated build scripts to work without Lisp dependencies +- All core MacPorts installation functionality remains intact diff --git a/action.yaml b/action.yaml index dbb66de..2b22ae0 100644 --- a/action.yaml +++ b/action.yaml @@ -11,7 +11,7 @@ inputs: action. When no pathname is provided, the configuration is expected to be found under - .github/parameters/gha-install-macports.yaml + .github/parameters/setup-macports.yaml It is however no error when this file is not present. diff --git a/configure_macports b/configure_macports index 07489af..e5e2a3b 100755 --- a/configure_macports +++ b/configure_macports @@ -2,10 +2,11 @@ # configure_macports — Configure MacPorts -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/development/lint b/development/lint deleted file mode 100755 index 9280b36..0000000 --- a/development/lint +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# lint — Lint GitHub Actions - -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. -# -# Copyright © 2022–2023 Michaël Le Barbier -# All rights reserved. - -# This file must be used under the terms of the MIT License. -# This source file is licensed as described in the file LICENSE, which -# you should have received as part of this distribution. The terms -# are also available at https://opensource.org/licenses/MIT - -: ${TOPLEVELDIR:=$(git rev-parse --show-toplevel)} - -lint_sbcl() -{ - sbcl --noinform --disable-debugger "$@" -} - -lint_main() -{ - lint_sbcl --load "${TOPLEVELDIR}/libexec/lisp/setup.lisp"\ - --eval '(org.melusina.atelier:lint #p".")' -} - -lint_main "$@" - -# End of file `lint' diff --git a/development/testsuite b/development/testsuite index 27fb60f..4327ec7 100755 --- a/development/testsuite +++ b/development/testsuite @@ -2,10 +2,11 @@ # testsuite — Run Testsuite for GitHub Actions -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/identify_self b/identify_self index 6543d60..164e647 100755 --- a/identify_self +++ b/identify_self @@ -2,10 +2,11 @@ # identify_self — Identify Self -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/install_macports b/install_macports index f195d3e..12fcb83 100755 --- a/install_macports +++ b/install_macports @@ -2,16 +2,11 @@ # install_macports — Install MacPorts on a GitHub Runner -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier -# All rights reserved. - -# Install MacPorts (https://github.com/melusina-org/gha-install-macports) -# This file is part of Install MacPorts. -# -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/libexec/lisp/development.lisp b/libexec/lisp/development.lisp deleted file mode 100644 index 6f0c07a..0000000 --- a/libexec/lisp/development.lisp +++ /dev/null @@ -1,60 +0,0 @@ -;;;; development.lisp — Project Development for Webmachine - -;;;; Melusina Actions (https://github.com/melusina-org/setup-macports) -;;;; This file is part of Melusina Actions. -;;;; -;;;; Copyright © 2022–2023 Michaël Le Barbier -;;;; All rights reserved. - -;;;; This file must be used under the terms of the MIT License. -;;;; This source file is licensed as described in the file LICENSE, which -;;;; you should have received as part of this distribution. The terms -;;;; are also available at https://opensource.org/licenses/MIT - -(require '#:org.melusina.atelier) - -(defpackage #:org.melusina.setup-macports/development - (:use #:common-lisp) - (:local-nicknames - (#:atelier #:org.melusina.atelier)) - (:export - #:lint)) - -(in-package #:org.melusina.setup-macports/development) - -(defun system-relative-pathname (pathname) - (flet ((system-source-directory () - (asdf:system-source-directory #.(string-downcase (package-name *package*))))) - (merge-pathnames pathname (system-source-directory)))) - -(defun system-relative-pathnames (&rest pathnames) - (mapcar #'system-relative-pathname pathnames)) - -(defparameter *parameter-bindings* - '((:copyright-holder . "Michaël Le Barbier") - (:copyright-year . "2022–2023") - (:project-filename . "setup-macports") - (:project-name . "Melusina Actions") - (:project-description . "GitHub Action to Install MacPorts") - (:project-long-description . - #.(concatenate 'string - "This GitHub Action is to install MacPorts.")) - (:homepage . "https://github.com/melusina-org/setup-macports") - (:license . :mit))) - -(defun lint () - (let ((atelier:*parameter-bindings* *parameter-bindings*)) - (atelier:lint - (system-relative-pathnames - #p".github" - #p"org.melusina.setup-macports.asd" - #p"configure_macports" - #p"development" - #p"identify_self" - #p"install_macports" - #p"libexec" - #p"subr" - #p"testsuite" - #p"validate_configuration")))) - -;;;; End of file `development.lisp' diff --git a/org.melusina.setup-macports.asd b/org.melusina.setup-macports.asd deleted file mode 100644 index eeb629e..0000000 --- a/org.melusina.setup-macports.asd +++ /dev/null @@ -1,23 +0,0 @@ -;;;; org.melusina.setup-macports.asd — System definition Install Macports - -;;;; Melusina Actions (https://github.com/melusina-org/setup-macports) -;;;; This file is part of Melusina Actions. -;;;; -;;;; Copyright © 2022–2023 Michaël Le Barbier -;;;; All rights reserved. - -;;;; This file must be used under the terms of the MIT License. -;;;; This source file is licensed as described in the file LICENSE, which -;;;; you should have received as part of this distribution. The terms -;;;; are also available at https://opensource.org/licenses/MIT - -(asdf:defsystem #:org.melusina.setup-macports/development - :description "Development tools for the GitHub Action Install MacPorts" - :author "Michaël Le Barbier" - :license "MIT License" - :depends-on (#:org.melusina.atelier) - :components - ((:module "libexec/lisp" - :components ((:file "development"))))) - -;;;; End of file `org.melusina.setup-macports.asd' diff --git a/subr/macos.sh b/subr/macos.sh index acfe8fb..99f34ce 100644 --- a/subr/macos.sh +++ b/subr/macos.sh @@ -1,9 +1,10 @@ # macos.sh — Functions for MacOS -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/subr/macports.sh b/subr/macports.sh index ab7f304..f52494d 100644 --- a/subr/macports.sh +++ b/subr/macports.sh @@ -1,9 +1,10 @@ # macports.sh — Functions for MacPorts -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/subr/stdlib.sh b/subr/stdlib.sh index a5d5fd6..a5c5cd8 100644 --- a/subr/stdlib.sh +++ b/subr/stdlib.sh @@ -1,9 +1,10 @@ # stdlib.sh — Shell Standard Library -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/subr/testsuite.sh b/subr/testsuite.sh index 4cd4f81..c5c3f74 100644 --- a/subr/testsuite.sh +++ b/subr/testsuite.sh @@ -1,9 +1,10 @@ # testsuite.sh — The testsuite function -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/testsuite/modules/macos b/testsuite/modules/macos index 3c1f5df..c04645d 100755 --- a/testsuite/modules/macos +++ b/testsuite/modules/macos @@ -2,10 +2,11 @@ # macos — Testsuite for MacOS functions -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/testsuite/stdlib/failwith b/testsuite/stdlib/failwith index b9b73f4..4985769 100755 --- a/testsuite/stdlib/failwith +++ b/testsuite/stdlib/failwith @@ -2,10 +2,11 @@ # failwith — Testsuite for the failwith function -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License. diff --git a/validate_configuration b/validate_configuration index 24a190e..ddbc402 100755 --- a/validate_configuration +++ b/validate_configuration @@ -2,10 +2,11 @@ # validate_configuration — Validate Configuration -# Melusina Actions (https://github.com/melusina-org/setup-macports) -# This file is part of Melusina Actions. +# Paranext Actions (https://github.com/paranext/setup-macports) +# This file is part of Paranext Actions. # -# Copyright © 2022–2023 Michaël Le Barbier +# Copyright © 2022–2023 Michaël Le Barbier (original author) +# Copyright © 2025 SIL Global and United Bible Societies (subsequent changes) # All rights reserved. # This file must be used under the terms of the MIT License.