diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2ded5ab..8021c5e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -39,7 +39,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -71,7 +71,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -104,7 +104,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index f3b5636..5f03968 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ about writing changes to this log. ## [Unreleased] +## [2.2.1] + +- Allowed `os2forms/os2forms` 4.0. +- Updated GitHub action dependencies. + ## [2.2.0] - Avoided loading submissions through `webform_submission` storage. @@ -44,7 +49,8 @@ about writing changes to this log. - Release 1.0.0 -[Unreleased]: https://github.com/OS2Forms/os2forms_rest_api/compare/2.2.0...HEAD +[Unreleased]: https://github.com/OS2Forms/os2forms_rest_api/compare/2.2.1...HEAD +[2.2.1]: https://github.com/OS2Forms/os2forms_rest_api/compare/2.2.0...2.2.1 [2.2.0]: https://github.com/OS2Forms/os2forms_rest_api/compare/2.1.0...2.2.0 [2.1.0]: https://github.com/OS2Forms/os2forms_rest_api/compare/2.0.3...2.1.0 [2.0.3]: https://github.com/OS2Forms/os2forms_rest_api/compare/2.0.2...2.0.3 diff --git a/composer.json b/composer.json index 54a6c51..e4c46e3 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "cweagans/composer-patches": "^1.7", "drupal/key_auth": "^2.0", "drupal/webform_rest": "^4.1", - "os2forms/os2forms": "^3.13" + "os2forms/os2forms": "^3.13 || ^4.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",