Skip to content

Commit ef1364f

Browse files
committed
Updated workflow configuration with environment variable that should ommit certain errors in Composer that you wouldn't get locally, dropping all .output-v2 files in favour of .output since 8.4 seems to manage to use .output in some cases anyway and we don't currently need differentiating between Composer 1 and 2
1 parent acdeeb5 commit ef1364f

File tree

15 files changed

+59
-309
lines changed

15 files changed

+59
-309
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ jobs:
3434

3535
- name: Build
3636
run: composer ci:build --ansi
37+
env:
38+
COMPOSER_TESTS_ARE_RUNNING: 1
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
5+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
46
- Applying patches for vaimo/composer-patches-sandbox (1)
57
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
68
Change: value17 => valueB; value5 => valueA
79

10+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
811
- Applying patches for vaimo/composer-patches-target1 (2)
912
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
1013
Change: value8 => valueC
@@ -13,18 +16,19 @@ Processing patches configuration
1316

1417
Writing patch info to install file
1518
Package operations: 0 installs, 1 update, 0 removals
16-
- Updating vaimo/composer-patches-target2 (0.0.0 => 1.2.0): Mirroring from modules/composer-patches-target2
17-
19+
- Upgrading vaimo/composer-patches-target2 (0.0.0 => 1.2.0): Mirroring from modules/composer-patches-target2
1820
Processing patches configuration
21+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
22+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
1923
- Applying patches for vaimo/composer-patches-sandbox (1)
2024
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
2125
Change: value17 => valueB; value5 => valueA
2226

2327
Writing patch info to install file
2428
Package operations: 0 installs, 1 update, 0 removals
25-
- Updating vaimo/composer-patches-target1 (0.0.0 => 1.0.0): Mirroring from modules/composer-patches-target1
26-
29+
- Upgrading vaimo/composer-patches-target1 (0.0.0 => 1.0.0): Mirroring from modules/composer-patches-target1
2730
Processing patches configuration
31+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
2832
- Applying patches for vaimo/composer-patches-target1 (2)
2933
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
3034
Change: value8 => valueC
@@ -35,6 +39,8 @@ Writing patch info to install file
3539
Package operations: 1 install, 0 updates, 0 removals
3640
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
3741
Processing patches configuration
42+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
43+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
3844
- Applying patches for vaimo/composer-patches-sandbox (1)
3945
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
4046
Change: value17 => valueB; value5 => valueA
@@ -43,10 +49,11 @@ Writing patch info to install file
4349
Package operations: 1 install, 0 updates, 0 removals
4450
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
4551
Processing patches configuration
52+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
4653
- Applying patches for vaimo/composer-patches-target1 (2)
4754
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
4855
Change: value8 => valueC
4956
~ {{PATCHES-OWNER}}: patches/single-package-single-file-wildcard-version.patch [NEW]
5057
Change: value17 => valueX
5158

52-
Writing patch info to install file
59+
Writing patch info to install file

test/scenarios/default-event-install-partial-reapply/.output-v2

Lines changed: 0 additions & 59 deletions
This file was deleted.

test/scenarios/default-event-update-partial-reapply/.output

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
5+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
46
- Applying patches for vaimo/composer-patches-sandbox (1)
57
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
68
Change: value17 => valueB; value5 => valueA
79

10+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
811
- Applying patches for vaimo/composer-patches-target1 (2)
912
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
1013
Change: value8 => valueC
@@ -13,18 +16,19 @@ Processing patches configuration
1316

1417
Writing patch info to install file
1518
Package operations: 0 installs, 1 update, 0 removals
16-
- Updating vaimo/composer-patches-target2 (0.0.0 => 1.2.0): Mirroring from modules/composer-patches-target2
17-
19+
- Upgrading vaimo/composer-patches-target2 (0.0.0 => 1.2.0): Mirroring from modules/composer-patches-target2
1820
Processing patches configuration
21+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
22+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
1923
- Applying patches for vaimo/composer-patches-sandbox (1)
2024
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
2125
Change: value17 => valueB; value5 => valueA
2226

2327
Writing patch info to install file
2428
Package operations: 0 installs, 1 update, 0 removals
25-
- Updating vaimo/composer-patches-target1 (0.0.0 => 1.0.0): Mirroring from modules/composer-patches-target1
26-
29+
- Upgrading vaimo/composer-patches-target1 (0.0.0 => 1.0.0): Mirroring from modules/composer-patches-target1
2730
Processing patches configuration
31+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
2832
- Applying patches for vaimo/composer-patches-target1 (2)
2933
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
3034
Change: value8 => valueC
@@ -35,6 +39,8 @@ Writing patch info to install file
3539
Package operations: 1 install, 0 updates, 0 removals
3640
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
3741
Processing patches configuration
42+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
43+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
3844
- Applying patches for vaimo/composer-patches-sandbox (1)
3945
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
4046
Change: value17 => valueB; value5 => valueA
@@ -43,6 +49,7 @@ Writing patch info to install file
4349
Package operations: 1 install, 0 updates, 0 removals
4450
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
4551
Processing patches configuration
52+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
4653
- Applying patches for vaimo/composer-patches-target1 (2)
4754
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
4855
Change: value8 => valueC

test/scenarios/default-event-update-partial-reapply/.output-v2

Lines changed: 0 additions & 59 deletions
This file was deleted.

test/scenarios/lock-persistence-install/.output

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
5+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
46
- Applying patches for vaimo/composer-patches-sandbox (1)
57
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
68
Change: value17 => valueB; value5 => valueA
79

10+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
811
- Applying patches for vaimo/composer-patches-target1 (2)
912
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
1013
Change: value8 => valueC
@@ -13,18 +16,19 @@ Processing patches configuration
1316

1417
Writing patch info to install file
1518
Package operations: 0 installs, 1 update, 0 removals
16-
- Updating vaimo/composer-patches-target2 (0.0.0 => 1.2.0): Mirroring from modules/composer-patches-target2
17-
19+
- Upgrading vaimo/composer-patches-target2 (0.0.0 => 1.2.0): Mirroring from modules/composer-patches-target2
1820
Processing patches configuration
21+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
22+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
1923
- Applying patches for vaimo/composer-patches-sandbox (1)
2024
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
2125
Change: value17 => valueB; value5 => valueA
2226

2327
Writing patch info to install file
2428
Package operations: 0 installs, 1 update, 0 removals
25-
- Updating vaimo/composer-patches-target1 (0.0.0 => 1.0.0): Mirroring from modules/composer-patches-target1
26-
29+
- Upgrading vaimo/composer-patches-target1 (0.0.0 => 1.0.0): Mirroring from modules/composer-patches-target1
2730
Processing patches configuration
31+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
2832
- Applying patches for vaimo/composer-patches-target1 (2)
2933
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
3034
Change: value8 => valueC
@@ -35,6 +39,8 @@ Writing patch info to install file
3539
Package operations: 1 install, 0 updates, 0 removals
3640
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
3741
Processing patches configuration
42+
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
43+
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
3844
- Applying patches for vaimo/composer-patches-sandbox (1)
3945
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
4046
Change: value17 => valueB; value5 => valueA
@@ -43,6 +49,7 @@ Writing patch info to install file
4349
Package operations: 1 install, 0 updates, 0 removals
4450
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
4551
Processing patches configuration
52+
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
4653
- Applying patches for vaimo/composer-patches-target1 (2)
4754
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
4855
Change: value8 => valueC

0 commit comments

Comments
 (0)