use forks for padriac packages (#126)

nanbando · Jun 23, 2021 · 2ac95c9 · 2ac95c9
1 parent ad5019a
commit 2ac95c9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/.github/workflows/phar-development.yml b/.github/workflows/phar-development.yml
@@ -11,9 +11,16 @@ on:
 
 jobs:
     compile:
-        name: "Compile PHAR without publishing"
+        name: "Compile PHAR without publishing with ${{ matrix.php-version }}"
         runs-on: "ubuntu-latest"
 
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - php-version: '7.4'
+                    - php-version: '8.0'
+
         steps:
             - name: "Checkout"
               uses: "actions/checkout@v2"
@@ -24,15 +31,17 @@ jobs:
               uses: "shivammathur/setup-php@v2"
               with:
                   coverage: "none"
-                  php-version: "7.4"
-                  tools: composer:v1
+                  php-version: ${{ matrix.php-version }}
+                  tools: composer:v2
+              env:
+                  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             - name: "Cache dependencies"
               uses: "actions/cache@v2"
               with:
                   path: "~/.composer/cache"
-                  key: "php-7.4-composer-${{ hashFiles('**/composer.json') }}"
-                  restore-keys: "php-7.4-composer-"
+                  key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+                  restore-keys: "php-${{ matrix.php-version }}-composer-"
 
             - name: "Install dependencies"
               run: "composer install --no-interaction --no-progress --no-suggest --no-dev"

diff --git a/.github/workflows/phar.yml b/.github/workflows/phar.yml
@@ -14,6 +14,12 @@ jobs:
         name: "Compile PHAR"
         runs-on: "ubuntu-latest"
 
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - php-version: '8.0'
+
         steps:
             - name: "Checkout"
               uses: "actions/checkout@v2"
@@ -24,15 +30,17 @@ jobs:
               uses: "shivammathur/setup-php@v2"
               with:
                   coverage: "none"
-                  php-version: "7.4"
+                  php-version: ${{ matrix.php-version }}
                   tools: composer:v1
+              env:
+                  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             - name: "Cache dependencies"
               uses: "actions/cache@v2"
               with:
                   path: "~/.composer/cache"
-                  key: "php-7.4-composer-${{ hashFiles('**/composer.json') }}"
-                  restore-keys: "php-7.4-composer-"
+                  key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+                  restore-keys: "php-${{ matrix.php-version }}-composer-"
 
             - name: "Install dependencies"
               run: "composer install --no-interaction --no-progress --no-suggest --no-dev"

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -27,6 +27,8 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-version }}
+              env:
+                  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Get composer cache directory
               id: composer-cache-dir

diff --git a/composer.json b/composer.json
@@ -16,6 +16,7 @@
         "ext-zip": "*",
         "dflydev/embedded-composer": "dev-master",
         "composer/composer": "^2.0",
+        "padraic/humbug_get_contents": "dev-master as 1.1.3",
         "symfony/console": "^5.2",
         "symfony/http-kernel": "^5.2",
         "symfony/dependency-injection": "^5.2",
@@ -68,6 +69,14 @@
         {
             "type": "vcs",
             "url": "[email protected]:nanbando/dflydev-embedded-composer.git"
+        },
+        {
+            "type": "vcs",
+            "url": "[email protected]:nanbando/phar-updater.git"
+        },
+        {
+            "type": "vcs",
+            "url": "[email protected]:nanbando/file_get_contents.git"
         }
     ]
 }