aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-24 16:37:47 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-08-24 18:54:37 +0200
commit07491f4b98e0548b41e21bb13a32f3f840b0ab1f (patch)
tree408bd091b28be15ac9fe0202777f8d839c92af76
parentee90f1bc19c4a62f34f7a329596d613aa931d8a8 (diff)
downloadPeerTube-07491f4b98e0548b41e21bb13a32f3f840b0ab1f.tar.gz
PeerTube-07491f4b98e0548b41e21bb13a32f3f840b0ab1f.tar.zst
PeerTube-07491f4b98e0548b41e21bb13a32f3f840b0ab1f.zip
Add fixtures cache to github actions
-rw-r--r--.github/workflows/test.yml12
-rw-r--r--server/tests/api/videos/video-transcoder.ts2
-rw-r--r--shared/extra-utils/miscs/miscs.ts4
3 files changed, 14 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6edf3bf8c..f0bd3ba37 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,12 +66,22 @@ jobs:
66 with: 66 with:
67 path: | 67 path: |
68 **/node_modules 68 **/node_modules
69 ~/fixtures
70 key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }} 69 key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}
71 restore-keys: | 70 restore-keys: |
72 ${{ runner.OS }}-node- 71 ${{ runner.OS }}-node-
73 ${{ runner.OS }}- 72 ${{ runner.OS }}-
74 73
74 - name: Cache fixtures
75 uses: actions/cache@v2
76 with:
77 path: |
78 fixtures
79 key: ${{ runner.OS }}-fixtures-${{ matrix.test_suite }}-${{ hashFiles('fixtures/*') }}
80 restore-keys: |
81 ${{ runner.OS }}-fixtures-${{ matrix.test_suite }}-
82 ${{ runner.OS }}-fixtures-
83 ${{ runner.OS }}-
84
75 - name: Install dependencies 85 - name: Install dependencies
76 run: yarn install --frozen-lockfile 86 run: yarn install --frozen-lockfile
77 87
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index 13b3530b1..e3fd0ec22 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -242,7 +242,7 @@ describe('Test video transcoding', function () {
242 }) 242 })
243 243
244 it('Should wait for transcoding before publishing the video', async function () { 244 it('Should wait for transcoding before publishing the video', async function () {
245 this.timeout(80000) 245 this.timeout(160000)
246 246
247 { 247 {
248 // Upload the video, but wait transcoding 248 // Upload the video, but wait transcoding
diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts
index 6a73f461e..dfd6e28cb 100644
--- a/shared/extra-utils/miscs/miscs.ts
+++ b/shared/extra-utils/miscs/miscs.ts
@@ -66,8 +66,8 @@ async function testImage (url: string, imageName: string, imagePath: string, ext
66function buildAbsoluteFixturePath (path: string, customCIPath = false) { 66function buildAbsoluteFixturePath (path: string, customCIPath = false) {
67 if (isAbsolute(path)) return path 67 if (isAbsolute(path)) return path
68 68
69 if (customCIPath) { 69 if (customCIPath && process.env.GITHUB_WORKSPACE) {
70 return join(process.env.HOME, 'fixtures', path) 70 return join(process.env.GITHUB_WORKSPACE, 'fixtures', path)
71 } 71 }
72 72
73 return join(root(), 'server', 'tests', 'fixtures', path) 73 return join(root(), 'server', 'tests', 'fixtures', path)