Merge branch 'master' into github-build

elifesciences · Nov 28, 2024 · 485d7ba · 485d7ba
2 parents 3baefcf + 99aac78
commit 485d7ba
Show file tree

Hide file tree

Showing 13 changed files with 227 additions and 98 deletions.
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1,7 +1,7 @@
 ARG image_tag=latest
 FROM pinterb/jq:0.0.16 AS jq
 FROM elifesciences/journal_composer_dev:${image_tag} AS composer
-FROM elifesciences/journal:${image_tag}
+FROM --platform="linux/amd64" elifesciences/journal:${image_tag}
 
 USER root
 RUN mkdir -p build/ci var/fixtures && \

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ BRANCH = master
 update-patterns:
 	composer require elife/patterns:dev-$(BRANCH)
 
-build:
+build: vendor
 	$(DOCKER_COMPOSE) build
 
 vendor:
@@ -24,8 +24,9 @@ stop:
 
 clean:
 	$(DOCKER_COMPOSE) down --volumes --remove-orphans
+	rm -rf vendor
 
-test:
+test: vendor
 	APP_ENV=ci $(DOCKER_COMPOSE) run --rm app vendor/bin/phpunit $(TEST) $(OPTIONS)
 	APP_ENV=ci $(DOCKER_COMPOSE) down --volumes
 

diff --git a/composer.json b/composer.json
@@ -57,7 +57,7 @@
         "behat/mink-extension": "^2.3",
         "behat/mink-selenium2-driver": "^1.3",
         "behat/symfony2-extension": "^2.1",
-        "elife/api": "^2.30",
+        "elife/api": "^2.31",
         "elife/api-validator": "^1.0@dev",
         "jarnaiz/behat-junit-formatter": "^1.3",
         "justinrainbow/json-schema": "^5.2",