From b9df99614ed8e11d1015ba7e6e8ecf89f91d1a14 Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Mon, 18 Sep 2023 17:07:18 +0100 Subject: [PATCH 1/6] wip: run as current user --- composer-action.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/composer-action.bash b/composer-action.bash index b61a22f..1b67096 100755 --- a/composer-action.bash +++ b/composer-action.bash @@ -203,6 +203,7 @@ fi echo "name=full_command::${command_string}" >> $GITHUB_OUTPUT docker run --rm \ + --user $(id -u):$(id -g) \ --volume "${github_action_path}/composer.phar":/usr/local/bin/composer \ --volume ~/.gitconfig:/root/.gitconfig \ --volume ~/.ssh:/root/.ssh \ From f4e0a9ef8854b167f0b9a21cc817e15e11ad08ab Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Mon, 18 Sep 2023 17:07:49 +0100 Subject: [PATCH 2/6] wip: debug ls --- composer-action.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/composer-action.bash b/composer-action.bash index 1b67096..ea7bf0d 100755 --- a/composer-action.bash +++ b/composer-action.bash @@ -214,3 +214,5 @@ docker run --rm \ --network host \ ${memory_limit} \ ${docker_tag} ${command_string} + +ls -la From 751d2088bd96f92ba1444e2e375d5ca76a0ef9af Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Mon, 18 Sep 2023 17:12:58 +0100 Subject: [PATCH 3/6] wip: mount in current working dir --- composer-action.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer-action.bash b/composer-action.bash index ea7bf0d..0668e41 100755 --- a/composer-action.bash +++ b/composer-action.bash @@ -206,7 +206,7 @@ docker run --rm \ --user $(id -u):$(id -g) \ --volume "${github_action_path}/composer.phar":/usr/local/bin/composer \ --volume ~/.gitconfig:/root/.gitconfig \ - --volume ~/.ssh:/root/.ssh \ + --volume ~/.ssh:~/.ssh \ --volume "${GITHUB_WORKSPACE}":/app \ --volume "/tmp/composer-cache":/tmp/composer-cache \ --workdir ${container_workdir} \ From fc4d2aafcd6ca20df0019cb52f7809c32c7c7e10 Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Mon, 18 Sep 2023 17:21:53 +0100 Subject: [PATCH 4/6] wip: switch to test branch of php-build --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index a4b8332..d6acd8c 100644 --- a/action.yml +++ b/action.yml @@ -107,7 +107,7 @@ runs: id: composer_run run: | set -e - bash <(curl -s https://raw.githubusercontent.com/php-actions/php-build/v2.2.0/php-build.bash) composer + bash <(curl -s https://raw.githubusercontent.com/php-actions/php-build/71c70785217ec6d052c62eb547d874d6f9112d11/php-build.bash) composer ${{ github.action_path }}/composer-action.bash shell: bash From 0c8abbde8971b5f67be11ba6aa07d289dc56b5bb Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Mon, 18 Sep 2023 17:22:27 +0100 Subject: [PATCH 5/6] wip: use runner home directory --- composer-action.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer-action.bash b/composer-action.bash index 0668e41..a208faf 100755 --- a/composer-action.bash +++ b/composer-action.bash @@ -205,8 +205,8 @@ echo "name=full_command::${command_string}" >> $GITHUB_OUTPUT docker run --rm \ --user $(id -u):$(id -g) \ --volume "${github_action_path}/composer.phar":/usr/local/bin/composer \ - --volume ~/.gitconfig:/root/.gitconfig \ - --volume ~/.ssh:~/.ssh \ + --volume ~/.gitconfig:/home/runner/.gitconfig \ + --volume ~/.ssh:/home/runner/.ssh \ --volume "${GITHUB_WORKSPACE}":/app \ --volume "/tmp/composer-cache":/tmp/composer-cache \ --workdir ${container_workdir} \ From 1e5d1834a1ddc41aa2a5fdd72849825e17c91160 Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Mon, 18 Sep 2023 17:38:06 +0100 Subject: [PATCH 6/6] wip: use runner home directory --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index d6acd8c..4efbd2e 100644 --- a/action.yml +++ b/action.yml @@ -107,7 +107,7 @@ runs: id: composer_run run: | set -e - bash <(curl -s https://raw.githubusercontent.com/php-actions/php-build/71c70785217ec6d052c62eb547d874d6f9112d11/php-build.bash) composer + bash <(curl -s https://raw.githubusercontent.com/php-actions/php-build/8e7b8be8ce6c9bc342fc698b9a35de69e7b855b7/php-build.bash) composer ${{ github.action_path }}/composer-action.bash shell: bash