graycoreio · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/_internal-install.yaml b/.github/workflows/_internal-install.yaml
@@ -27,18 +27,21 @@ jobs:
     outputs:
       matrix: ${{ steps.supported-version.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ./supported-version
+        with:
+          kind: all
         id: supported-version
       - run: echo ${{ steps.supported-version.outputs.matrix }}
 
   install-test:
     needs: compute_matrix
     strategy:
       matrix: ${{ fromJSON(needs.compute_matrix.outputs.matrix) }}
+      fail-fast: false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./installation-test
       with:
         composer_version: ${{ matrix.composer }}

diff --git a/.github/workflows/_internal-integration.yaml b/.github/workflows/_internal-integration.yaml
@@ -27,8 +27,10 @@ jobs:
       outputs:
         matrix: ${{ steps.supported-version.outputs.matrix }}
       steps:
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
         - uses: ./supported-version
+          with:
+            kind: all
           id: supported-version
         - run: echo ${{ steps.supported-version.outputs.matrix }}
   integration-workflow:
@@ -39,3 +41,4 @@ jobs:
       source_folder: $GITHUB_WORKSPACE/_test/demo-package
       matrix: ${{ needs.compute_matrix.outputs.matrix }}
       test_command: ../../../vendor/bin/phpunit ../../../vendor/graycore/magento2-demo-package/Test/Integration
+      fail-fast: false
diff --git a/.github/workflows/_internal-unit.yaml b/.github/workflows/_internal-unit.yaml
@@ -27,7 +27,7 @@ jobs:
           - 8.1
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./unit-test
       with:
         source_folder: _test/demo-package

diff --git a/.github/workflows/_internal_test_actions.yaml b/.github/workflows/_internal_test_actions.yaml
@@ -7,13 +7,15 @@ on:
     paths:
     - ".github/workflows/_internal-supported-version.yaml"
     - "supported-version/**"
+    - "package.json"
     - "!(**/*.md)"
   pull_request:
     branches:
     - main
     paths:
     - ".github/workflows/_internal-supported-version.yaml"
     - "supported-version/**"
+    - "package.json"
     - "!(**/*.md)"
 
 jobs:

diff --git a/.github/workflows/integration-README.md b/.github/workflows/integration-README.md
@@ -6,20 +6,21 @@ A Github Workflow that runs the Integration Tests of a Magento Package
 
 See the [integration.yaml](./integration.yaml)
 
-| Input              | Description                                                   | Required | Default                       |
-| ------------------ | ------------------------------------------------------------- | -------- | ----------------------------- |
-| matrix             | JSON string of [version matrix for Magento](./#matrix-format) | true     | NULL                          |
-| fail-fast          | Same as Github's [fail-fast](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast)  | false     | true                          |
-| package_name       | The name of the package                                       | true     | NULL                          |
-| source_folder      | The source folder of the package                              | false    | $GITHUB_WORKSPACE             |
-| magento_directory  | The folder where Magento will be installed                    | false    | ../magento2                   |
-| magento_repository | Where to install Magento from                                 | false    | https://mirror.mage-os.org/   |
-| test_command       | The integration test command to run                           | false    | "../../../vendor/bin/phpunit" |
+| Input              | Description                                                                                                                                     | Required | Default                       |
+| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------------------------- |
+| matrix             | JSON string of [version matrix for Magento](./#matrix-format)                                                                                   | true     | NULL                          |
+| fail-fast          | Same as Github's [fail-fast](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast) | false    | true                          |
+| package_name       | The name of the package                                                                                                                         | true     | NULL                          |
+| source_folder      | The source folder of the package                                                                                                                | false    | $GITHUB_WORKSPACE             |
+| magento_directory  | The folder where Magento will be installed                                                                                                      | false    | ../magento2                   |
+| magento_repository | Where to install Magento from                                                                                                                   | false    | https://mirror.mage-os.org/   |
+| test_command       | The integration test command to run                                                                                                             | false    | "../../../vendor/bin/phpunit" |
+| composer_cache_key | A key to version the composer cache. Can be incremented if you need to bust the cache.                                                          | false    | ""                            |
 
 ## Secrets
 | Input         | Description                                                                                                                             | Required | Default |
 | ------------- | --------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------- |
-| composer_auth | JSON string of [composer credentials]([#./matrix-format](https://devdocs.magento.com/guides/v2.4/install-gde/prereq/connect-auth.html)) | false     | NULL    |
+| composer_auth | JSON string of [composer credentials]([#./matrix-format](https://devdocs.magento.com/guides/v2.4/install-gde/prereq/connect-auth.html)) | false    | NULL    |
 
 ###  Matrix Format
 

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -41,6 +41,12 @@ on:
         default: ../../../vendor/bin/phpunit
         description: "The integration test command to run"
 
+      composer_cache_key:
+        type: string
+        required: false
+        default: ''
+        description: A key to version the composer cache. Can be incremented if you need to bust the cache.
+
     secrets:
       composer_auth:
         required: false
@@ -97,6 +103,16 @@ jobs:
         COMPOSER_AUTH: ${{ secrets.composer_auth }}
       name: Create Magento ${{ matrix.magento }} Project 
 
+    - run: |
+        echo "::set-output name=version::$(cat composer.json | jq '.require 
+        | with_entries( select(.key == "magento/product-community-edition" or .key == "magento/product-enterprise-edition") )
+        | to_entries 
+        | .[0].value')"
+      shell: bash
+      working-directory:  ${{ inputs.magento_directory }}
+      name: Compute Installable Magento version
+      id: magento-version
+
     - name: Get Composer Cache Directory
       shell: bash
       working-directory:  ${{ inputs.magento_directory }}
@@ -107,7 +123,7 @@ jobs:
     - name: "Cache Composer Packages"
       uses: actions/cache@v3
       with:
-        key: 'composer | v3 | "$(Agent.OS)"  | composer.lock | ${{ matrix.composer }} | ${{ matrix.php }} | ${{ matrix.magento }}' 
+        key: "composer | v5 | ${{ inputs.composer_cache_key }} | ${{ hashFiles('composer.lock') }} | ${{ matrix.os }} | ${{ matrix.composer }} | ${{ matrix.php }} | ${{ matrix.magento }}"
         path: ${{ steps.composer-cache.outputs.dir }}
 
     - run: composer config repositories.local path ${{ inputs.source_folder }}
@@ -118,6 +134,8 @@ jobs:
     - run: composer require monolog/monolog:"<2.7.0" --no-update
       name: Fixup Monolog (https://github.com/magento/magento2/pull/35596)
       working-directory:  ${{ inputs.magento_directory }}
+      if: |
+        steps.magento-version.outputs.version == '"2.4.4"'
 
     - run: | 
         composer config --no-interaction allow-plugins.dealerdirect/phpcodesniffer-composer-installer true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.1.0](https://github.com/graycoreio/github-actions-magento2/compare/v1.0.0...v1.1.0) (2022-08-14)
+
+
+### Features
+
+* make cache key consistent (and configurable) ([#38](https://github.com/graycoreio/github-actions-magento2/issues/38)) ([cbbba62](https://github.com/graycoreio/github-actions-magento2/commit/cbbba628dd290c81ed4708d3d3bb87abadb0c7ce))
+* **supported-version:** add all kind ([#36](https://github.com/graycoreio/github-actions-magento2/issues/36)) ([26c354d](https://github.com/graycoreio/github-actions-magento2/commit/26c354d8d4d1f7ce689f37236b7b0ee27b11221f))
+* **supported-version:** add support for v2.4.5 ([#35](https://github.com/graycoreio/github-actions-magento2/issues/35)) ([affb1ce](https://github.com/graycoreio/github-actions-magento2/commit/affb1ce1f942799647f57eb6b1096bf0e4afd560))
+
+
+### Bug Fixes
+
+* **integration:** only run monolog fixup on v2.4.4 ([#37](https://github.com/graycoreio/github-actions-magento2/issues/37)) ([841670a](https://github.com/graycoreio/github-actions-magento2/commit/841670a97fccd29d52b760bf0989ac5bb224ba3d))
+
 ## 1.0.0 (2022-08-06)
 
 

diff --git a/installation-test/action.yml b/installation-test/action.yml
@@ -41,6 +41,11 @@ inputs:
     required: true
     default: "https://mirror.mage-os.org/"
     description: "Where to install Magento from"
+
+  composer_cache_key:
+    required: false
+    default: ''
+    description: A key to version the composer cache. Can be incremented if you need to bust the cache.
 
   composer_auth:
     required: false
@@ -74,7 +79,7 @@ runs:
     - name: "Cache Composer Packages"
       uses: actions/cache@v3
       with:
-        key: 'composer | v3 | "$(Agent.OS)"  | composer.lock | ${{ inputs.composer_version }} | ${{ inputs.php_version }} | ${{ inputs.magento_version }}' 
+        key: "composer | v5 | ${{ inputs.composer_cache_key }} | ${{ hashFiles('composer.lock') }} | ${{ runner.os }} | ${{ inputs.composer_version }} | ${{ inputs.php_version }} | ${{ inputs.magento_version }}"
         path: ${{ steps.composer-cache.outputs.dir }}
 
     - run: composer config repositories.local path ${{ inputs.source_folder }}