Merge pull request #467 from bugsnag/fix-ci

Fix failing CI
bugsnag · Jan 13, 2022 · b8eb1dc · b8eb1dc
2 parents 3f8dbbb + fd81f16
commit b8eb1dc
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 25 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,4 @@
 /README.md export-ignore
 /Makefile export-ignore
 /phpunit.xml.dist export-ignore
+/vendor export-ignore
diff --git a/features/fixtures/laravel56/Dockerfile b/features/fixtures/laravel56/Dockerfile
@@ -11,11 +11,9 @@ RUN apt-get update && \
 WORKDIR /app
 
 COPY . .
+COPY --from=composer:2.2 /usr/bin/composer /usr/local/bin/composer
 
-RUN ./install_composer.sh
-
-RUN php composer.phar install --prefer-dist
-
+RUN composer install
 RUN php artisan key:generate
 
 CMD php artisan serve --port=8000 --host=0.0.0.0
diff --git a/features/fixtures/laravel56/composer.json b/features/fixtures/laravel56/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "bugsnag/bugsnag-laravel": "dev-master as 99.99.99",
+        "bugsnag/bugsnag-laravel": "dev-main as 99.99.99",
         "fideloper/proxy": "~4.0",
         "laravel/framework": "5.6.*",
         "laravel/tinker": "~1.0",

diff --git a/features/fixtures/laravel58/Dockerfile b/features/fixtures/laravel58/Dockerfile
@@ -11,11 +11,9 @@ RUN apt-get update && \
 WORKDIR /app
 
 COPY . .
+COPY --from=composer:2.2 /usr/bin/composer /usr/local/bin/composer
 
-RUN ./install_composer.sh
-
-RUN php composer.phar install --prefer-dist
-
+RUN composer install
 RUN php artisan key:generate
 
 CMD php artisan serve --port=8000 --host=0.0.0.0
diff --git a/features/fixtures/laravel58/composer.json b/features/fixtures/laravel58/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "bugsnag/bugsnag-laravel": "dev-master as 99.99.99",
+        "bugsnag/bugsnag-laravel": "dev-main as 99.99.99",
         "fideloper/proxy": "^4.0",
         "laravel/framework": "5.8.*",
         "laravel/tinker": "^1.0",

diff --git a/features/fixtures/laravel66/Dockerfile b/features/fixtures/laravel66/Dockerfile
@@ -11,11 +11,9 @@ RUN apt-get update && \
 WORKDIR /app
 
 COPY . .
+COPY --from=composer:2.2 /usr/bin/composer /usr/local/bin/composer
 
-RUN ./install_composer.sh
-
-RUN php composer.phar install --prefer-dist
-
+RUN composer install
 RUN php artisan key:generate
 
 CMD php artisan serve --port=8000 --host=0.0.0.0
diff --git a/features/fixtures/laravel66/composer.json b/features/fixtures/laravel66/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^7.2",
-        "bugsnag/bugsnag-laravel": "dev-master as 99.99.99",
+        "bugsnag/bugsnag-laravel": "dev-main as 99.99.99",
         "fideloper/proxy": "^4.0",
         "laravel/framework": "^6.2",
         "laravel/tinker": "^2.0",

diff --git a/features/fixtures/laravel8/Dockerfile b/features/fixtures/laravel8/Dockerfile
@@ -11,13 +11,10 @@ RUN apt-get update && \
 WORKDIR /app
 
 COPY . .
+COPY --from=composer:2.2 /usr/bin/composer /usr/local/bin/composer
 
 RUN cp .env.example .env
-
-RUN ./install_composer.sh
-
-RUN php composer.phar install --prefer-dist
-
+RUN composer install
 RUN php artisan key:generate
 
 CMD php -S 0.0.0.0:8000 -t public
diff --git a/features/fixtures/laravel8/composer.json b/features/fixtures/laravel8/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "bugsnag/bugsnag-laravel": "dev-master as 99.99.99",
+        "bugsnag/bugsnag-laravel": "dev-main as 99.99.99",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^8.54",

diff --git a/features/fixtures/lumen8/Dockerfile b/features/fixtures/lumen8/Dockerfile
@@ -11,9 +11,8 @@ RUN apt-get update && \
 WORKDIR /app
 
 COPY . .
+COPY --from=composer:2.2 /usr/bin/composer /usr/local/bin/composer
 
-RUN ./install_composer.sh
-
-RUN php composer.phar install --prefer-dist
+RUN composer install
 
 CMD php -S 0.0.0.0:8000 -t public
diff --git a/features/fixtures/lumen8/composer.json b/features/fixtures/lumen8/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "laravel/lumen-framework": "^8.0",
-        "bugsnag/bugsnag-laravel": "dev-master as 99.99.99"
+        "bugsnag/bugsnag-laravel": "dev-main as 99.99.99"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",