Merge pull request #2951 from ClearlyClaire/glitch-soc/merge-upstream #1809

Job	Run time
build (production)	4m 37s
build (test)	4m 55s
test (3.2)	6m 37s
End to End testing (3.2)	3m 40s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 19s
test (3.3)	5m 56s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 17s
test (.ruby-version)	7m 26s
End to End testing (3.3)	3m 49s
Libvips tests (3.2)	2m 23s
End to End testing (.ruby-version)	2m 58s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 17s
Libvips tests (3.3)	2m 2s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 49s
Libvips tests (.ruby-version)	3m 18s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 13s
	1h 5m 36s

Provide feedback