169 Commits

Author	SHA1	Message	Date
Marc Alexander	d2f4a48694	Merge branch '3.3.x'	2024-10-03 09:33:55 +00:00
Marc Alexander	44f04a91f3	[ticket/17407] Combine create and update step and use replace edit-mode ... [skip ci] Since this change won't run until merged. PHPBB-17407	2024-10-03 11:29:51 +02:00
Marc Alexander	efc667eca5	Merge branch '3.3.x'	2024-10-03 08:20:40 +00:00
Marc Alexander	1b0c9b22e0	[ticket/17407] Update comment in merge check if possible ... PHPBB-17407	2024-10-03 09:32:43 +02:00
Marc Alexander	071a91ac85	Merge pull request #6721 from marc1706/ticket/17400 ... [ticket/17400] Use fixed version for mssql 2017 tests	2024-09-29 11:30:13 +02:00
Marc Alexander	65794eb96f	Merge branch '3.3.x'	2024-09-29 09:14:18 +00:00
Marc Alexander	fe4d8bfa7e	[ticket/17396] Use GitHub App to merge to master ... [skip actions] Due to no code changes that run in PRs. PHPBB-17396	2024-09-29 11:09:46 +02:00
Marc Alexander	9938613d42	Merge branch '3.3.x'	2024-09-28 16:52:14 +01:00
Marc Alexander	d5e94f1d97	[ticket/17394] Merge local 3.3.x and not remote into master ... PHPBB-17394	2024-09-28 16:14:22 +01:00
Marc Alexander	5229152604	[ticket/17400] Use ubuntu 20.04 until microsoft fixes their container ... PHPBB-17400	2024-09-28 15:23:35 +01:00
Marc Alexander	a23fb62817	Merge branch '3.3.x'	2024-09-25 15:21:07 +01:00
Marc Alexander	08d184b0fa	[ticket/17396] Try running other-tests on ubuntu-20.04 ... PHPBB-17396	2024-09-25 14:34:54 +01:00
Marc Alexander	d6a17c1fe7	[ticket/17396] Fetch full history and branch 3.3.x if merging to master ... PHPBB-17396	2024-09-19 20:48:21 +02:00
Marc Alexander	17d066a980	[ticket/17396] Only try pushing if merge was successful ... PHPBB-17396	2024-09-18 20:41:03 +02:00
Marc Alexander	df5c769b55	Merge branch '3.3.x'	2024-09-18 20:33:25 +02:00
Marc Alexander	4fb06b00b7	[ticket/17396] Adjust merge code ... PHPBB-17396	2024-09-17 22:10:28 +02:00
Marc Alexander	3d70d87b57	[ticket/17396] Split merge check to master to separate yml file ... PHPBB-17396	2024-09-17 21:46:03 +02:00
Marc Alexander	f55d747bb4	[ticket/17396] Add workflow for merging 3.3.x into master ... PHPBB-17396	2024-09-17 20:38:14 +02:00
Marc Alexander	db18f54234	Merge branch '3.3.x'	2024-09-17 20:28:47 +02:00
Marc Alexander	e406308244	[ticket/17394] Specify pull_request_target types ... PHPBB-17394	2024-09-16 21:38:39 +02:00
Marc Alexander	15556319d9	[ticket/17394] Try using pull_request_target event ... PHPBB-17394	2024-09-16 20:13:16 +02:00
Marc Alexander	7a21119d17	[ticket/17394] Check mergeability of 3.3.x PRs ... PHPBB-17394	2024-09-15 20:34:25 +02:00
Marc Alexander	fdf9cb0ca8	Merge branch 'ticket/17377' into ticket/17377-master	2024-08-06 21:10:21 +02:00
Marc Alexander	8b7f215309	[ticket/17377] Use specific mssql docker images to have uniform builds ... PHPBB-17377	2024-08-06 21:08:10 +02:00
Marc Alexander	c36c6a2308	[ticket/12479] Use fixed mssql docker version until Microsoft learns testing ... PHPBB-12479	2024-07-24 21:29:35 +02:00
Marc Alexander	20c9656420	[ticket/17342] Disable PHP 8.4 builds on windows for now ... PHPBB-17342	2024-06-16 20:58:43 +02:00
Marc Alexander	a865e85886	Merge branch 'ticket/17342-3.3.x' into ticket/17342	2024-06-16 20:44:29 +02:00
Marc Alexander	abaef09a14	[ticket/17342] Add tests for PHP 8.4 to GitHub Actions ... PHPBB-17342	2024-06-16 20:31:57 +02:00
Marc Alexander	d2cd8ecf66	[ticket/17342] Add tests for PHP 8.4 to GitHub Actions ... PHPBB-17342	2024-06-15 11:41:16 +02:00
Marc Alexander	a7b4f035a4	Merge branch '3.3.x'	2024-06-01 08:32:01 +02:00
Marc Alexander	8954a68953	[ticket/17308] Change project key to start with PHPBB- ... PHPBB-17308	2024-05-18 08:27:19 +02:00
Marc Alexander	d318768634	[ticket/17176] Use correct ldap URI ... PHPBB3-17176	2024-05-07 21:57:48 +02:00
Marc Alexander	843cb97048	[ticket/17176] Use ldapuri instead of removed ldaphost ... PHPBB3-17176	2024-05-07 21:57:35 +02:00
Marc Alexander	b5f867c3cc	[ticket/17310] Update node action to v3 and node version to 20 ... PHPBB3-17310	2024-05-07 21:24:20 +02:00
Marc Alexander	ec1f322440	Merge branch 'ticket/17310' into ticket/17310-master	2024-05-07 21:24:08 +02:00
Marc Alexander	a85c36b15e	[ticket/17310] Update workflow actions to v4 ... PHPBB3-17310	2024-05-07 21:21:10 +02:00
Marc Alexander	5ada5728ee	[ticket/17010] Also check .js.twig files with eslint ... PHPBB3-17010	2024-02-24 11:58:32 +01:00
Marc Alexander	3513c85ee6	[ticket/17010] Stop skipping node dependency setup on slow tests ... PHPBB3-17010	2024-02-24 11:58:29 +01:00
Marc Alexander	9bd9962aea	[ticket/17010] Resolve test issues and add node install for webpush testing ... PHPBB3-17010	2024-02-24 11:58:28 +01:00
rxu	bf26da660a	[ticket/17233] Add PHP 8.3 tests to the 3.3.x branch ... PHPBB3-17233	2023-11-26 22:44:40 +07:00
Marc Alexander	316b061de1	[ticket/17193] Remove mariadb versions not working right now ... PHPBB3-17193	2023-09-22 12:10:30 +02:00
Marc Alexander	8143ec6060	[ticket/17193] Fix invalid PHP versions ... PHPBB3-17193	2023-09-22 11:27:18 +02:00
Marc Alexander	19d7e5ffef	[ticket/17193] Reduce amount of runners ... PHPBB3-17193	2023-09-22 11:14:24 +02:00
Marc Alexander	1ee4d8387b	[ticket/17193] Run unit tests on single runners again ... PHPBB3-17193	2023-09-22 11:07:41 +02:00
Marc Alexander	3e2628fb73	[ticket/17176] Ensure slow tests are not run when not selected ... PHPBB3-17176	2023-09-18 19:28:22 +02:00
Marc Alexander	1f9d14357c	[ticket/17176] Manually include mysql 5.7 builds and change naming of builds ... PHPBB3-17176	2023-09-18 19:28:22 +02:00
Marc Alexander	6320acb445	[ticket/17176] Add type to test name ... PHPBB3-17176	2023-09-18 19:28:22 +02:00
Marc Alexander	875d1afd56	[ticket/17176] Use correct ldap URI ... PHPBB3-17176	2023-09-18 19:28:22 +02:00
Marc Alexander	7c05df1aa8	[ticket/17176] Run functional and unit tests separately ... PHPBB3-17176	2023-09-18 19:28:22 +02:00
Marc Alexander	f051644c77	[ticket/17176] Use matrix definitions for building build matrix ... PHPBB3-17176	2023-09-18 19:28:22 +02:00