Merge branch '3.x' into appgroup_functional_teamInvitationstest

apigee · Nov 7, 2023 · 5e2c59c · 5e2c59c
2 parents 9fd5795 + ef4d8ee
commit 5e2c59c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -9,6 +9,9 @@ env:
   APIGEE_EDGE_INSTANCE_TYPE: ${{ secrets.APIGEE_EDGE_INSTANCE_TYPE }}
   APIGEE_INTEGRATION_ENABLE: ${{ secrets.APIGEE_INTEGRATION_ENABLE }}
   APIGEE_EDGE_ENDPOINT: ${{ secrets.APIGEE_EDGE_ENDPOINT }}
+  APIGEE_EDGE_ACCOUNT_JSON_KEY: ${{ secrets.APIGEE_EDGE_ACCOUNT_JSON_KEY }}
+  APIGEE_EDGE_HYBRID_ENDPOINT: ${{ secrets.APIGEE_EDGE_HYBRID_ENDPOINT }}
+  APIGEE_EDGE_HYBRID_ORGANIZATION: ${{ secrets.APIGEE_EDGE_HYBRID_ORGANIZATION }}
   BROWSERTEST_OUTPUT_DIRECTORY: "sites/simpletest/browser_output"
   BROWSERTEST_OUTPUT_BASE_URL: ""
   MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", { "chromeOptions": { "w3c": false } }, "http://127.0.0.1:9515/wd/hub"]'
@@ -24,7 +27,7 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    name: "PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal-core }}"
+    name: "PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal-core }} | ${{ matrix.instance-type }}"
     strategy:
       fail-fast: false
       matrix:
@@ -34,6 +37,9 @@ jobs:
         drupal-core:
           # Should update the following as the minimum supported version from Drupal.org
           - "10.1.x"
+        instance-type:
+          - "Edge"
+          - "X"
 
     steps:
 
@@ -95,6 +101,7 @@ jobs:
         composer update --with-all-dependencies
         composer require --dev phpspec/prophecy-phpunit:^2
         composer require --dev drupal/classy:^1.0
+        composer require --dev mglaman/phpstan-drupal:1.2.0
         composer config --no-plugins allow-plugins.drupal/console-extend-plugin true
 
     # Install drupal using minimal installation profile and enable the module.
@@ -105,11 +112,17 @@ jobs:
         vendor/bin/drush en apigee_edge -y
         vendor/bin/drush rs 8000 &
 
-    - name: "PHPCS"
+    - name: "PHPCS and setting up Apigee X environment"
+      if: ${{ matrix.instance-type == 'X' }}
       run: |
         cd drupal
         cp modules/contrib/apigee_edge/phpcs.xml.dist .
         vendor/bin/phpcs --standard=./phpcs.xml.dist modules/contrib/apigee_edge -p -s -n --colors
+        # Setting environment variables to run Apigee X tests
+        echo "APIGEE_EDGE_INSTANCE_TYPE=hybrid" >> $GITHUB_ENV
+        echo "APIGEE_EDGE_ORGANIZATION=$APIGEE_EDGE_HYBRID_ORGANIZATION" >> $GITHUB_ENV
+        echo "APIGEE_EDGE_ENDPOINT=$APIGEE_EDGE_HYBRID_ENDPOINT" >> $GITHUB_ENV
+        composer show > composer-show.txt
 
     - name: "Drupal check"
       run: |
@@ -134,20 +147,20 @@ jobs:
       run: |
         cd drupal
         cp modules/contrib/apigee_edge/phpunit.core.xml.dist core/phpunit.xml
-        vendor/bin/phpunit -c core --verbose --color --group apigee_edge --testsuite unit,kernel,functional,functional-javascript --debug --coverage-clover /tmp/coverage.xml modules/contrib/apigee_edge
+        vendor/bin/phpunit -c core --verbose --color --group apigee_edge --testsuite unit,kernel,functional,functional-javascript --debug --coverage-clover /tmp/coverage_${{ matrix.instance-type }}.xml modules/contrib/apigee_edge
 
     - name: Artifacts
       if: failure()
       uses: actions/upload-artifact@v3
       with:
-        name: browser-output-${{ matrix.php-version }}-${{ matrix.drupal-core }}-artifact
+        name: browser-output-${{ matrix.php-version }}-${{ matrix.drupal-core }}-${{ matrix.instance-type }}-artifact
         path: drupal/sites/simpletest/browser_output/*
 
     - name: Upload coverage to Codecov
       if: ${{ matrix.drupal-core == '9.5.x' && matrix.php-version == '8.1' }}
       uses: codecov/codecov-action@v3
       with:
-        files: /tmp/coverage.xml
+        files: /tmp/coverage_${{ matrix.instance-type }}.xml
         name: codecov-umbrella
         fail_ci_if_error: true
         verbose: true
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "~8.1.0 || ~8.2.0",
         "ext-json": "*",
-        "apigee/apigee-client-php": "^3.0.1",
+        "apigee/apigee-client-php": "~3.0.2",
         "drupal/core": "^10.1",
         "drupal/entity": "^1.0",
         "drupal/key": "^1.8",
@@ -33,11 +33,6 @@
             "services": {
                 "drush.services.yml": "^12"
             }
-        },
-        "patches": {
-            "drupal/core": {
-                "Add a method to access the original property": "https://www.drupal.org/files/issues/2023-07-22/2839195-105.patch"
-            }
         }
     }
 }