CI: use composer v2

contributte · Jan 5, 2021 · 430d41f · 430d41f
1 parent 1342c27
commit 430d41f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -13,8 +13,8 @@ on:
 env:
   extensions: "json"
   cache-version: "1"
-  composer-version: "v1"
-  composer-install: "composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable"
+  composer-version: "v2"
+  composer-install: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable"
   coverage: "none"
 
 jobs:
@@ -54,6 +54,8 @@ jobs:
           extensions: "${{ env.extensions }}"
           tools: "composer:${{ env.composer-version }}, cs2pr"
           coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -114,6 +116,8 @@ jobs:
           extensions: "${{ env.extensions }}"
           tools: "composer:${{ env.composer-version }}"
           coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -153,8 +157,6 @@ jobs:
             composer-args: ""
       fail-fast: false
 
-    continue-on-error: "${{ matrix.php-version == '8.0' }}"
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -181,6 +183,8 @@ jobs:
           extensions: "${{ env.extensions }}"
           tools: "composer:${{ env.composer-version }}"
           coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -247,6 +251,8 @@ jobs:
           extensions: "${{ env.extensions }}"
           tools: "composer:${{ env.composer-version }}"
           coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
   "repositories": [
     {
       "type": "vcs",
-      "url": "https://github.com/f3l1x/oauth2-facebook"
+      "url": "git@github.com:f3l1x/oauth2-facebook.git"
     }
   ],
   "require": {
@@ -27,7 +27,7 @@
     "nette/http": "^3.0.5"
   },
   "require-dev": {
-    "league/oauth2-facebook": "dev-master#f9bf29ba9dced5957b334157d6740fe650899b86",
+    "league/oauth2-facebook": "dev-master",
     "league/oauth2-google": "^3.0.3",
     "mockery/mockery": "^1.3.3",
     "ninjify/qa": "^0.12",