diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c9ef967..6f76b22 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: steps: - name: Trigger Workflow uses: actions/github-script@v7 - if: ${{ github.event_name != 'pull_request' }} + if: ${{ github.event_name == 'push' }} with: github-token: ${{ secrets.PAT }} script: | diff --git a/built/createJob.js b/built/createJob.js index 89f1e46..f4e8ae0 100644 --- a/built/createJob.js +++ b/built/createJob.js @@ -120,7 +120,7 @@ function createJob(config, job, gitRev) { _a.label = 1; case 1: _a.trys.push([1, 7, , 8]); - return [4 /*yield*/, docker.run(dockerImage, ['php', '/runner'], [stdout, stderr], { + return [4 /*yield*/, docker.run(dockerImage, ['php', '/app/runner'], [stdout, stderr], { HostConfig: getHostConfig(type, config), Env: env, Binds: binds, diff --git a/built/createJob.js.map b/built/createJob.js.map index 0e84420..9ea5307 100644 --- a/built/createJob.js.map +++ b/built/createJob.js.map @@ -1 +1 @@ -{"version":3,"file":"createJob.js","sourceRoot":"","sources":["../src/createJob.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"createJob.js","sourceRoot":"","sources":["../src/createJob.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/createJob.ts b/src/createJob.ts index 8450584..e4ba12a 100644 --- a/src/createJob.ts +++ b/src/createJob.ts @@ -78,7 +78,7 @@ function createJob (config, job: Job, gitRev) { runLog.log.info('Starting container for', data.slug) var startTime = Date.now() try { - const container = await docker.run(dockerImage, ['php', '/runner'], [stdout, stderr], { + const container = await docker.run(dockerImage, ['php', '/app/runner'], [stdout, stderr], { HostConfig: getHostConfig(type, config), Env: env, Binds: binds,