diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b005230..c674822 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,11 @@ jobs: tags: opencodeco/phpctl:php${{ matrix.php }} - name: Test + env: + PHP_VERSION: ${{ matrix.php }} + PHPCTL_TTY: --label=no-tty run: | - PHPCTL_TTY="--label=no-tty" ./lib/bashunit ./tests/ + ./lib/bashunit ./tests/ - name: Build and push uses: docker/build-push-action@v5 diff --git a/tests/docker_test.sh b/tests/docker_test.sh index 90926aa..23d89ec 100644 --- a/tests/docker_test.sh +++ b/tests/docker_test.sh @@ -1,3 +1,3 @@ function test_run_echoes_run_command() { - assert_matches "^docker run --rm -v (.*) -w /opt --entrypoint php --label=no-tty opencodeco/phpctl:php82$" "$(./phpctl run)" + assert_matches "^docker run --rm -v (.*) -w /opt --entrypoint php --label=no-tty opencodeco/phpctl:php(82|83)$" "$(./phpctl run)" }