From 38a8aa0666f1f2cd3509b5feaad521916851749f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Wed, 11 Jan 2023 19:47:29 +0100 Subject: [PATCH] ci(requirement-checker): Use bin/box.phar instead of the old box --- .github/workflows/requirement-checker.yaml | 8 ++++---- requirement-checker/Makefile.e2e | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/requirement-checker.yaml b/.github/workflows/requirement-checker.yaml index e27a6adbc..2d9f2eb10 100644 --- a/.github/workflows/requirement-checker.yaml +++ b/.github/workflows/requirement-checker.yaml @@ -178,16 +178,16 @@ jobs: name: box-phar # The original target is for the publishing, which is different from the internal name used. - - name: Correct the target name - run: mv box.phar box && touch -c box + - name: Ensure the make target is up to date + run: mv box.phar bin/box.phar && touch -c box # See https://github.com/actions/download-artifact#limitations # the permissions are not guaranteed to be preserved - name: Ensure PHAR is executable - run: chmod 755 box + run: chmod 755 bin/box.phar - name: Check that the PHAR works - run: ./box --ansi --version + run: bin/box.phar --ansi --version - name: Build the Docker images run: cd requirement-checker; make docker_images diff --git a/requirement-checker/Makefile.e2e b/requirement-checker/Makefile.e2e index ef34adbea..bea13b0a8 100644 --- a/requirement-checker/Makefile.e2e +++ b/requirement-checker/Makefile.e2e @@ -2,8 +2,8 @@ MAKEFLAGS += --warn-undefined-variables MAKEFLAGS += --no-builtin-rules -E2E_BOX_BIN = ../box -E2E_BOX = $(E2E_BOX_BIN) +SCOPED_BOX_BIN = ../bin/box.phar +SCOPED_BOX = $(SCOPED_BOX_BIN) DIFF = diff --strip-trailing-cr --ignore-all-space --side-by-side --suppress-common-lines @@ -268,8 +268,8 @@ docker_images: @# The caching is taken care of within the script @./../.docker/build -$(E2E_TEST_PASS_NO_CONFIG_PHAR): $(E2E_BOX_BIN) $(shell find $(E2E_TEST_PASS_NO_CONFIG_DIR)) - $(E2E_BOX) compile --ansi --working-dir=$(E2E_TEST_PASS_NO_CONFIG_DIR) --no-parallel +$(E2E_TEST_PASS_NO_CONFIG_PHAR): $(SCOPED_BOX_BIN) $(shell find $(E2E_TEST_PASS_NO_CONFIG_DIR)) + $(SCOPED_BOX) compile --ansi --working-dir=$(E2E_TEST_PASS_NO_CONFIG_DIR) --no-parallel mkdir -p $(E2E_TEST_PASS_NO_CONFIG_OUTPUT_DIR) mv $(E2E_TEST_PASS_NO_CONFIG_DIR)/index.phar $(E2E_TEST_PASS_NO_CONFIG_PHAR) touch -c $(E2E_TEST_PASS_NO_CONFIG_PHAR) @@ -285,8 +285,8 @@ $(E2E_TEST_PASS_NO_CONFIG_MIN_BOX_EXPECTED_STDERR): $(E2E_TEST_PASS_NO_CONFIG_MI $(E2E_TEST_PASS_NO_CONFIG_MIN_BOX_EXPECTED_STDERR_TEMPLATE) \ > $@ -$(E2E_TEST_PASS_COMPLETE_PHAR): $(E2E_BOX_BIN) $(E2E_TEST_PASS_COMPLETE_PHAR_SRC) - $(E2E_BOX) compile --ansi --working-dir=$(E2E_TEST_PASS_COMPLETE_DIR) --no-parallel +$(E2E_TEST_PASS_COMPLETE_PHAR): $(SCOPED_BOX_BIN) $(E2E_TEST_PASS_COMPLETE_PHAR_SRC) + $(SCOPED_BOX) compile --ansi --working-dir=$(E2E_TEST_PASS_COMPLETE_DIR) --no-parallel mkdir -p $(E2E_TEST_PASS_COMPLETE_OUTPUT_DIR) mv $(E2E_TEST_PASS_COMPLETE_DIR)/index.phar $(E2E_TEST_PASS_COMPLETE_PHAR) touch -c $(E2E_TEST_PASS_COMPLETE_PHAR) @@ -303,8 +303,8 @@ $(E2E_TEST_PASS_COMPLETE_MIN_BOX_EXPECTED_STDERR): $(E2E_TEST_PASS_COMPLETE_MIN_ $(E2E_TEST_PASS_COMPLETE_MIN_BOX_EXPECTED_STDERR_TEMPLATE) \ > $@ -$(E2E_TEST_FAIL_COMPLETE_PHAR): $(E2E_BOX_BIN) $(E2E_TEST_FAIL_COMPLETE_PHAR_SRC) - $(E2E_BOX) compile --ansi --working-dir=$(E2E_TEST_FAIL_COMPLETE_DIR) --no-parallel +$(E2E_TEST_FAIL_COMPLETE_PHAR): $(SCOPED_BOX_BIN) $(E2E_TEST_FAIL_COMPLETE_PHAR_SRC) + $(SCOPED_BOX) compile --ansi --working-dir=$(E2E_TEST_FAIL_COMPLETE_DIR) --no-parallel mkdir -p $(E2E_TEST_FAIL_COMPLETE_OUTPUT_DIR) mv $(E2E_TEST_FAIL_COMPLETE_DIR)/index.phar $(E2E_TEST_FAIL_COMPLETE_PHAR) touch -c $(E2E_TEST_FAIL_COMPLETE_PHAR)