cleanup

humbug · Nov 1, 2023 · 5f6e887 · 5f6e887
1 parent 925d8b1
commit 5f6e887
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 37 deletions.
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -69,30 +69,30 @@ jobs:
             fail-fast: false
             matrix:
                 e2e:
-#                    - 'e2e_004'
-#                    - 'e2e_005'
-#                    - 'e2e_011'
-#                    - 'e2e_013'
-#                    - 'e2e_014'
-#                    - 'e2e_015'
-#                    - 'e2e_016'
-#                    - 'e2e_017'
-#                    - 'e2e_018'
-#                    - 'e2e_019'
-#                    - 'e2e_020'
-#                    - 'e2e_024'
-#                    - 'e2e_025'
-#                    - 'e2e_027'
-#                    - 'e2e_028'
-#                    - 'e2e_029'
-#                    - 'e2e_030'
-#                    - 'e2e_031'
-#                    - 'e2e_032'
-#                    - 'e2e_033'
-#                    - 'e2e_034'
+                    - 'e2e_004'
+                    - 'e2e_005'
+                    - 'e2e_011'
+                    - 'e2e_013'
+                    - 'e2e_014'
+                    - 'e2e_015'
+                    - 'e2e_016'
+                    - 'e2e_017'
+                    - 'e2e_018'
+                    - 'e2e_019'
+                    - 'e2e_020'
+                    - 'e2e_024'
+                    - 'e2e_025'
+                    - 'e2e_027'
+                    - 'e2e_028'
+                    - 'e2e_029'
+                    - 'e2e_030'
+                    - 'e2e_031'
+                    - 'e2e_032'
+                    - 'e2e_033'
+                    - 'e2e_034'
                     - 'e2e_035'
-#                    - 'e2e_036'
-#                    - 'e2e_037'
+                    - 'e2e_036'
+                    - 'e2e_037'
                 php:
                     - '8.1'
                     - '8.2'
@@ -146,9 +146,6 @@ jobs:
                 if: matrix.e2e == 'e2e_032'
                 run: sudo apt-get install -y tree
 
-            -   run: echo $SHELL
-            -   run: bash --version
-
             -   name: Run e2e ${{ matrix.e2e }}
                 run: make ${{ matrix.e2e }} --debug
 

diff --git a/.makefile/e2e.file b/.makefile/e2e.file
@@ -324,19 +324,8 @@ e2e_035: $(PHP_SCOPER_PHAR_BIN) fixtures/set035-composer-files-autoload/vendor f
 	composer --working-dir=build/set035-composer-files-autoload/scoped-guzzle5-include dump-autoload
 	rm -rf build/set035-composer-files-autoload/guzzle5-include || true
 
-	@echo "––––––––––––––––––––––-----"
-	echo "$SHELL"
-	echo "$$($SHELL) --version"
-	@echo "––––––––––––––––––––––-----"
-	php build/set035-composer-files-autoload/index.php
-	@echo "––––––––––––––––––––––-----"
-	touch build/set035-composer-files-autoload/output
 	php build/set035-composer-files-autoload/index.php 2>&1 > build/set035-composer-files-autoload/output
-	@echo "––––––––––––––––––––––-----"
-	cat build/set035-composer-files-autoload/output
-	@echo "––––––––––––––––––––––-----"
 	php build/set035-composer-files-autoload/test.php
-	@echo "HOYE"
 
 .PHONY: e2e_036
 e2e_036: # Runs end-to-end tests for the fixture set e2e_036 — Minimalistic codebase