Merge branch 'kohlerdominik-remove-composer-lock' into sdespont-qr-co…

…de-options # Conflicts: # .gitignore # composer.lock
sprain · May 15, 2024 · df58ef3 · df58ef3
2 parents dcbd2f6 + 05aafa2
commit df58ef3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4,606 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies
@@ -71,7 +71,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies

diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@
 /example/HtmlOutput/html-example.htm
 /example/FpdfOutput/fpdf_example.pdf
 /.php-cs-fixer.cache
+/composer.lock
 .idea/