Commit graph

19 commits

Author SHA1 Message Date
Jacob Tobiasz
43f73cac95
Resolve conflicts between 1.13 and 2.0 2023-12-04 14:25:08 +01:00
Jan Goralski
770c7ee90f
[Maintenance][Behat] Add suite isolation 2023-11-30 11:43:25 +01:00
Jacob Tobiasz
f5e2f29824
Add preparing manifest.json files to CI 2023-09-17 09:04:26 +02:00
Jakub Tobiasz
db819b8887
Fix CI 2023-05-14 07:40:03 +02:00
Jakub Tobiasz
c1d526e9df
Fix CI 2023-05-13 06:42:56 +02:00
Rafikooo
96dc607261
[CI] Change outdated GitHub action 2023-04-28 02:15:43 +02:00
Grzegorz Sadowski
0b65067199
minor #14964 Clean up conflicts for sylius/sylius (jakubtobiasz)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

As we usually bump dependencies version in minor versions of Sylius, I've prepared a cleanup of conflicts for the `sylius/sylius` package. Also, we should do the same for every package (as some packages have conflict for `twig/twig:^1.0` when it cannot be installed).

Commits
-------

d7f2080625 Clean up conflicts for sylius/sylius
51188508a4 Drop support for DBAL 2.7
2023-04-27 07:32:18 +02:00
Jakub Tobiasz
51188508a4
Drop support for DBAL 2.7 2023-04-26 13:24:37 +02:00
Rafikooo
2a56716441
[CI] Use SyliusLabs/BuildTestAppAction@v2.1 2023-04-24 22:02:29 +02:00
Grzegorz Sadowski
5f82cd5620
Merge branch '1.12' into 1.13
* 1.12:
  Ignore upmerge branches CI build on push event
  Update BuildTestApp actions within workflows
2023-04-20 12:07:21 +02:00
Jakub Tobiasz
acfc256b57
Update BuildTestApp actions within workflows 2023-04-20 08:50:58 +02:00
Grzegorz Sadowski
0a4430dfbf
Merge branch '1.12' into 1.13
* 1.12:
  Add var/log directory to artifacts on pipeline fail
  Remove obsolete information about cantons in Belgium
  Type in fixtures.rst
  [Docs] Add guide on how to add another implementation of UnitRefundInterface
2023-03-27 07:25:02 +02:00
Jakub Tobiasz
58c73cf0bb
Add var/log directory to artifacts on pipeline fail 2023-03-24 15:19:43 +01:00
Grzegorz Sadowski
f1271f905d
Merge branch '1.12' into 1.13
* 1.12:
  Remove excluding @api tag in JS-based Behat runs
  Add selecting only Behat scenarios with @javascript tag for JS-based tests
2023-03-15 10:25:22 +01:00
Jakub Tobiasz
1ac47774b3
Remove excluding @api tag in JS-based Behat runs 2023-03-15 08:41:30 +01:00
Jakub Tobiasz
4aa00e1a0b
Add selecting only Behat scenarios with @javascript tag for JS-based tests 2023-03-15 07:59:25 +01:00
Jakub Tobiasz
d6caba7fbe
Fix CI Full to run both 1.12 and 1.13 2023-02-02 10:58:16 +01:00
Jakub Tobiasz
e173690bd9
Fix workflows ext after downmerge 2023-01-25 14:31:37 +01:00
Jakub Tobiasz
987ca7a122
Rename all .yml to .yaml in workflows 2023-01-23 13:13:56 +01:00
Renamed from .github/workflows/ci_e2e-mysql.yml (Browse further)