From cc56286f6152bbb1ebb92b94b37a7d4347bbe444 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Fri, 24 May 2024 09:19:24 +0200 Subject: [PATCH] action: Fix the action test --- .github/workflows/linux.yml | 14 +++++++------- testrunner/config/default.yaml | 2 +- testrunner/src/testrunners/testrunner.js | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f316a1d..4ad4a3f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -10,15 +10,11 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v4 with: node-version: '20.x' - - name: Install sitespeed.io - run: | - git clone https://github.com/sitespeedio/sitespeed.io.git - npm install --prefix sitespeed.io -g + - uses: actions/checkout@v4 - name: Install Chrome run: | wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - @@ -36,5 +32,9 @@ jobs: run: | npm install --prefix testrunner node testrunner/app.js & - - name: Add a test - run: sitespeed.io https://www.wikipedia.org -n 1 --api.hostname 127.0.0.1 --api.location default --headless --api.json \ No newline at end of file + - name: Run a test + run: | + git clone https://github.com/sitespeedio/sitespeed.io.git + cd sitespeed.io + npm install + bin/sitespeed.js https://www.wikipedia.org -n 1 --api.hostname 127.0.0.1 --api.location default --headless --api.json \ No newline at end of file diff --git a/testrunner/config/default.yaml b/testrunner/config/default.yaml index 668e38d..9d386b1 100644 --- a/testrunner/config/default.yaml +++ b/testrunner/config/default.yaml @@ -42,7 +42,7 @@ logging: # The working directory for the testrunner, where it temporary will put it files # By default it used the os.tmpdir -# workingDirectory: "./" +# workingDirectory: "." # The sitespeed.io executable. The default is a globally installed sitespeed.io executable: "sitespeed.io" diff --git a/testrunner/src/testrunners/testrunner.js b/testrunner/src/testrunners/testrunner.js index ccffbdc..6b5f140 100644 --- a/testrunner/src/testrunners/testrunner.js +++ b/testrunner/src/testrunners/testrunner.js @@ -76,7 +76,7 @@ export default async function runJob(job) { async function createWorkingDirectory(job) { const baseWorkingDirectory = nconf.get('workingDirectory') || os.tmpdir(); - const directory = `${baseWorkingDirectory}${job.queue.name}/${job.id}`; + const directory = `${baseWorkingDirectory}/${job.queue.name}/${job.id}`; await mkdir(directory, { recursive: true }); return directory; }