Merge pull request #2962 from ClearlyClaire/glitch-soc/merge-upstream #1832

Job	Run time
build (production)	3m 59s
build (test)	4m 4s
Libvips tests (3.2)	1m 55s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 2s
Libvips tests (3.3)	2m 5s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 49s
test (3.2)	6m 21s
Libvips tests (.ruby-version)	2m 12s
End to End testing (3.2)	2m 41s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 15s
test (3.3)	5m 46s
End to End testing (3.3)	3m 5s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 12s
test (.ruby-version)	6m 41s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 26s
End to End testing (.ruby-version)	3m 1s
	59m 34s

Provide feedback