Merge pull request #2968 from ClearlyClaire/glitch-soc/merge-upstream #1842

Job	Run time
build (production)	4m 28s
build (test)	4m 33s
test (3.2)	6m 42s
Libvips tests (3.2)	2m 9s
test (3.3)	6m 22s
End to End testing (3.2)	3m 1s
Libvips tests (3.3)	1m 55s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 8s
test (.ruby-version)	6m 29s
End to End testing (3.3)	3m 1s
Libvips tests (.ruby-version)	2m 22s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 1s
End to End testing (.ruby-version)	2m 44s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 41s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 42s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 45s
	1h 1m 3s

Provide feedback