Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci(requirement-checker): Use bin/box.phar instead of the old box #801

Merged
merged 1 commit into from
Jan 11, 2023
Merged

ci(requirement-checker): Use bin/box.phar instead of the old box #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/requirement-checker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions requirement-checker/Makefile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down