Merge pull request #2966 from ClearlyClaire/glitch-soc/merge-upstream #1837

Job	Run time
build (production)	1m 16s
build (test)	1m 12s
test (3.2)	7m 6s
Libvips tests (3.2)	2m 16s
End to End testing (3.2)	3m 5s
test (3.3)	6m 6s
Libvips tests (3.3)	1m 53s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 6s
End to End testing (3.3)	2m 47s
test (.ruby-version)	6m 43s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 28s
Libvips tests (.ruby-version)	2m 9s
End to End testing (.ruby-version)	2m 44s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 54s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 30s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 57s
	54m 12s

Provide feedback