Merge pull request #2903 from ClearlyClaire/glitch-soc/merge-upstream #1717

Job	Run time
build (production)	4m 27s
build (test)	4m 20s
test (3.2)	5m 53s
Libvips tests (3.2)	1m 54s
test (.ruby-version)	7m 4s
End to End testing (3.2)	2m 51s
Libvips tests (.ruby-version)	2m 11s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 49s
End to End testing (.ruby-version)	2m 43s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 43s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 55s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	2m 59s
	42m 49s

Provide feedback