Merge pull request #2974 from ClearlyClaire/glitch-soc/merge-upstream #1852

Job	Run time
build (production)	4m 3s
build (test)	3m 55s
End to End testing (3.2)	2m 47s
test (3.2)	6m 16s
End to End testing (3.3)	3m 7s
Libvips tests (3.2)	2m 11s
test (3.3)	6m 12s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 49s
Libvips tests (3.3)	2m 1s
End to End testing (.ruby-version)	3m 51s
test (.ruby-version)	6m 19s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 7s
Libvips tests (.ruby-version)	2m 18s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 18s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 24s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 17s
	1h 0m 55s

Provide feedback