diff --git a/action.yml b/action.yml index 5e8ab90..46f5a29 100644 --- a/action.yml +++ b/action.yml @@ -16,7 +16,7 @@ inputs: default: 'admin1234' runner: description: 'Runner git repository' - default: 'https://code.forgejo.org/fogejo/runner' + default: 'https://code.forgejo.org/forgejo/runner' runner-version: description: 'Runner version' default: 'v1.4.1' @@ -44,7 +44,7 @@ runs: cd $(mktemp -d) dependencies.sh forgejo.sh setup ${{ inputs.user }} "${{ inputs.password }}" ${{ inputs.image }}:${{ inputs.image-version }} - forgejo-runner.sh setup + forgejo-runner.sh setup ${{ inputs.runner }} ${{ inputs.runner-version }} http://$(cat forgejo-ip):3000/ echo url="http://$(cat forgejo-ip):3000" >> $GITHUB_OUTPUT echo host-port="$(cat forgejo-ip):3000" >> $GITHUB_OUTPUT echo token=$(cat forgejo-token) >> $GITHUB_OUTPUT diff --git a/forgejo-runner.sh b/forgejo-runner.sh index 5ef6b54..cd311b6 100755 --- a/forgejo-runner.sh +++ b/forgejo-runner.sh @@ -41,12 +41,14 @@ function register() { function run() { ./forgejo-runner/forgejo-runner daemon >& forgejo-runner.log & echo $! > forgejo-runner-pid + sleep 1 + cat forgejo-runner.log } function setup() { local git="${1:-https://codeberg.org/forgejo/runner}" - local version="${1:-v1.4.1}" - local forgejo="${1:-http://$(cat forgejo-ip):3000/}" + local version="${2:-v1.4.1}" + local forgejo="${3:-http://$(cat forgejo-ip):3000/}" dependencies checkout $git