Merge branch '4.x' of github.com:pantheon-systems/terminus into lops-1688

Author: kporras07

.env.dist

@@ -1,16 +1,45 @@
 export PROJECT_PATH=$(realpath .)
-export TERMINUS_SITE="terminus-test-site"
+## Note: The terminus test site must have some quicksilver scripts enabled
+## in order for tests to pass.
+## Needed for unit test fixutures
+export TERMINUS_PROJECT_ROOT=${PROJECT_PATH}
+
+## This is the site that will be used for testing
+export TERMINUS_SITE="ci-terminus-composer"
+
+## This is the site that will be used for testing wordpress commands
 export TERMINUS_SITE_WP="terminus-test-site-wordpress"
+
+## This is the site that will be used for testing wordpress network
 export TERMINUS_SITE_WP_NETWORK="terminus-test-site-wp-network"
+
+## This is the site that will be used for cloning a test environment on which to run tests
 export TERMINUS_ENV="dev"
+
+## this is the org that will be used. The site(s) above need to be in this org
 export TERMINUS_ORG="Agency"
+
+## This is the user that will be used for testing Should be attached the token below
 export TERMINUS_USER="[email protected]"
+
 ## To Autoload your token from your local machine, change the TERMINUS_TOKEN to the following command:
 ## export TERMINUS_TOKEN=$(cat $HOME/.terminus/cache/tokens/[email protected] | jq -r .token)
 export TERMINUS_TOKEN="{TERMINUS TOKEN}"
+
+## this is the folder that terminus will use to store its data during the tests
 export TERMINUS_BASE_DIR="/tmp/terminus-data"
+
+## this is the folder that terminus will use to store its plugins during the tests
 export TERMINUS_PLUGINS2_DIR="${TERMINUS_BASE_DIR}/plugins"
+
+## this is the folder that terminus will use to store its plugins during the tests
 export TERMINUS_PLUGINS_DIR="${TERMINUS_BASE_DIR}/plugins-3.x"
+
+## Used for testing plugins
 export TERMINUS_DEPENDENCIES_BASE_DIR="${TERMINUS_BASE_DIR}/dependencies-1"
+
+## this will prevent the tests from creating a test environment for the run
 export TERMINUS_TESTING_RUNTIME_ENV=
+
+## this will prevent tests from reinstalling the development packages once a phar is built
 export TERMINUS_ON_PHAR_COMPLETE_REINSTALL_COMPOSER_WITH_DEV=1

.github/workflows/3x.yml

@@ -1,8 +1,6 @@
-name: Terminus 3.x
+name: Terminus 4.x
 on:
   push:
-  schedule:
-    - cron: '0 6 * * *'
   workflow_dispatch:
     inputs:
       functional_tests_group:
@@ -14,23 +12,28 @@ on:
         required: true
         default: "0"
 
+# Cancel previous runs of this same branch/PR/etc.
+concurrency:
+  group: 'ci-${{ github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 jobs:
   # Checkout in separate job because docker image is alpine based and checkout action doesn't work.
   checkout_build:
     runs-on: ubuntu-latest
     container:
-      image: quay.io/pantheon-public/php-ci:v7.4
+      image: quay.io/pantheon-public/php-ci:v8.2
     name: Checkout & build Phar
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Save repo content as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: full-workspace
           path: ${{ github.workspace }}
       - name: Full Composer Install
-        run: composer install
+        run: composer install --dev
       - name: Validate Code
         run: composer code:lint
       - name: Phar Build
@@ -40,7 +43,7 @@ jobs:
           export PATH=~/box/vendor/bin:$PATH
           composer phar:build
       - name: Save terminus.phar as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: terminus-phar
           path: terminus.phar
@@ -53,38 +56,46 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'macos-latest' ]
-        php-versions: [ '7.4', '8.2', '8.3' ]
+        php-versions: [ '8.2', '8.4' ]
       max-parallel: 1
     env:
       TERMINUS_TOKEN: ${{ secrets.TERMINUS_TOKEN }}
-      TERMINUS_SITE: ${{ secrets.TERMINUS_SITE }}
-      TERMINUS_SITE_WP: ${{ secrets.TERMINUS_SITE_WP }}
-      TERMINUS_SITE_WP_NETWORK: ${{ secrets.TERMINUS_SITE_WP_NETWORK }}
-      TERMINUS_ORG: ${{ secrets.TERMINUS_ORG }}
-      TERMINUS_BASE_DIR: ${{ secrets.TERMINUS_BASE_DIR }}
-      TERMINUS_PLUGINS_DIR: ${{ secrets.TERMINUS_PLUGINS_DIR }}
-      TERMINUS_PLUGINS2_DIR: ${{ secrets.TERMINUS_PLUGINS2_DIR }}
-      TERMINUS_DEPENDENCIES_BASE_DIR: ${{ secrets.TERMINUS_DEPENDENCIES_BASE_DIR }}
+      TERMINUS_SITE: ${{ vars.TERMINUS_SITE }}
+      TERMINUS_SITE_WP: ${{ vars.TERMINUS_SITE_WP }}
+      TERMINUS_SITE_WP_NETWORK: ${{ vars.TERMINUS_SITE_WP_NETWORK }}
+      TERMINUS_ORG: ${{ vars.TERMINUS_ORG }}
+      TERMINUS_BASE_DIR: ${{ vars.TERMINUS_BASE_DIR }}
+      TERMINUS_PLUGINS_DIR: ${{ vars.TERMINUS_PLUGINS_DIR }}
+      TERMINUS_PLUGINS2_DIR: ${{ vars.TERMINUS_PLUGINS2_DIR }}
+      TERMINUS_DEPENDENCIES_BASE_DIR: ${{ vars.TERMINUS_DEPENDENCIES_BASE_DIR }}
       TERMINUS_USER: ${{ secrets.TERMINUS_USER }}
+      TERMINUS_HOST: ${{ vars.TERMINUS_HOST }}
+      TERMINUS_PORT: ${{ vars.TERMINUS_PORT }}
+      TERMINUS_VERIFY_HOST_CERT: ${{ vars.TERMINUS_VERIFY_HOST_CERT }}
+      HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+      HOMBEBREW_NO_AUTO_UPDATE: 1
     needs: [ checkout_build ]
     steps:
       - name: Install SSH key
-        uses: webfactory/ssh-agent@v0.5.3
+        uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.TERMINUS_SITE_OWNER_SSH_PRIVATE_KEY }}
+      - run: brew update && brew upgrade icu4c
+        if: runner.os == 'macOS'
+        continue-on-error: true
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: gd, mbstring, zip, ssh2-1.3.1, pcov
+          extensions: gd, mbstring, zip, ssh2-1.4.1, pcov
           coverage: pcov
           ini-values: error_reporting=E_ALL
       - name: Download repo content from artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: full-workspace
       - name: Download terminus.phar as artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: terminus-phar
       - name: Install Composer Dependencies
@@ -101,14 +112,6 @@ jobs:
       - name: Functional Tests (arbitrary group)
         if: ${{ github.event.inputs.functional_tests_group != '' && github.event.inputs.functional_tests_group != 'all' }}
         run: composer test:group -- ${{ github.event.inputs.functional_tests_group }}
-
-      - name: Coverage Report
-        run: composer coverage
-      - name: Save coverage as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: CoverageReport
-          path: docs/TestCoverage.md
       - name: Finish sesssion
         if: ${{ always() && github.event.inputs.tmate_enabled == 1 }}
         run: |
@@ -122,12 +125,12 @@ jobs:
     runs-on: ubuntu-latest
     name: Release
     container:
-      image: quay.io/pantheon-public/php-ci:1.x
+      image: quay.io/pantheon-public/php-ci:v8.2
     needs: [ functional ]
     if: ${{ startsWith(github.ref, 'refs/tags/')  && github.repository == 'pantheon-systems/terminus' }}
     steps:
       - name: Download terminus.phar as artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: terminus-phar
       - name: Release
@@ -151,112 +154,3 @@ jobs:
           tag: ${{github.ref}}
           revision: ${{github.sha}}
           formula: terminus
-
-  package_linux:
-    runs-on: ubuntu-latest
-    name: Package .deb Release
-    container:
-      image: quay.io/pantheon-public/php-ci:v7.4
-    if: ${{ startsWith(github.ref, 'refs/tags/')  && github.repository_owner == 'pantheon-systems' }}
-    needs: [ release ]
-    steps:
-      - name: Download repo content from artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: full-workspace
-      - name: Download terminus.phar as artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: terminus-phar
-      - name: Full Composer Install
-        run: composer install
-      - name: Prepare needed folder and fix permissions
-        run: mkdir -p ~/.terminus/cache/tokens && mv ./terminus.phar ./terminus && chmod +x ./terminus
-      - name: Passegers, gather ye packages
-        run: composer bundle:linux
-      - name: Save terminus deb as artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: terminus-deb
-          path: ./*.deb
-          if-no-files-found: error
-
-  publish_linux:
-    runs-on: ubuntu-latest
-    name: Publish .deb Release
-    strategy:
-      matrix:
-        # Add needed repositories in the form of <package_name>/<distro>/<version>.
-        repository:
-          - 'terminus/debian/buster'
-          - 'terminus/debian/bullseye'
-          - 'terminus/debian/bookworm'
-          - 'terminus/ubuntu/bionic'
-          - 'terminus/ubuntu/focal'
-          - 'terminus/ubuntu/groovy'
-          - 'terminus/ubuntu/hirsute'
-          - 'terminus/ubuntu/impish'
-    if: ${{ startsWith(github.ref, 'refs/tags/')  && github.repository_owner == 'pantheon-systems' }}
-    needs: [ 'package_linux' ]
-    steps:
-      - name: Download terminus deb as artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: terminus-deb
-      - uses: docker://lpenz/ghaction-packagecloud:v0.2
-        with:
-          user: stovak
-          repository: ${{ matrix.repository }}
-          path: |
-            *.deb
-        env:
-          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
-
-  # # NOT CURRENTLY USED
-  # behat_tests:
-  #   runs-on: ubuntu-latest
-  #   name: Behat Tests
-  #   needs: [ checkout_build ]
-  #   if: ${{ startsWith(github.ref, 'refs/tags/')  && github.repository_owner == 'pantheon-systems' }}
-  #   strategy:
-  #     matrix:
-  #       php-versions: [ '7.4', '8.0' ]
-  #     fail-fast: false
-  #   env:
-  #     TERMINUS_VERBOSITY: 22
-  #     TERMINUS_EXECUTABLE: terminus
-  #     TERMINUS_TEST_MODE: 1
-  #     TERMINUS_TOKEN: ${{ secrets.TERMINUS_TOKEN }}
-  #   steps:
-  #     - name: Setup PHP with PECL extension
-  #       uses: shivammathur/setup-php@v2
-  #       with:
-  #         php-version: ${{ matrix.php-versions }}
-  #         extensions: gd, mbstring, zip
-  #         coverage: pcov
-  #     - name: Download repo content from artifact
-  #       uses: actions/download-artifact@v2
-  #       with:
-  #         name: full-workspace
-  #     - name: Download terminus.phar as artifact
-  #       uses: actions/download-artifact@v2
-  #       with:
-  #         name: terminus-phar
-  #     - name: Install Composer Dependencies
-  #       run: composer install --no-interaction --prefer-dist
-  #     - name: Fix permissions
-  #       run: chmod +x ./bin/terminus
-  #     - name: Behat Tests
-  #       run: composer test:behat
-
-  # # NOT CURRENTLY USED
-  # package_macos:
-  #   runs-on: macos-latest
-  #   name: Package a Homebrew release
-  #   if: ${{ startsWith(github.ref, 'refs/tags/')  && github.repository_owner == 'pantheon-systems' }}
-  #   needs: [ 'functional_tests', 'behat_tests' ]
-  #   steps:
-  #     - name: Brew Tap Terminus
-  #       run: brew install stovak/terminus/terminus
-  #     - name: Update tap with new release
-  #       run: brew bump-formula-pr --url=${{ steps.tagged.outputs.url }} --no-browse --no-audit --commit stovak/terminus/terminus