Merge pull request #2848 from ClearlyClaire/glitch-soc/merge-upstream #1587

Job	Run time
build (production)	4m 5s
build (test)	4m 22s
End to End testing (3.1)	2m 30s
End to End testing (3.2)	2m 14s
Libvips tests (3.1)	1m 28s
End to End testing (.ruby-version)	2m 47s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 23s
Libvips tests (3.2)	1m 31s
test (3.1)	5m 34s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 12s
test (3.2)	5m 37s
Libvips tests (.ruby-version)	2m 2s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 14s
test (.ruby-version)	7m 20s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 51s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 10s
	55m 20s

Provide feedback