Skip to content
Snippets Groups Projects
Commit de20164d authored by David Beniamine's avatar David Beniamine
Browse files

Merge branch '6-fix-tests-and-ci' into 'annotation-on-video'

Fix CI configuration

Closes #6

See merge request iiif/mirador-video-annotation!6
parents 3c8d1070 cff6b420
No related branches found
No related tags found
1 merge request!6Fix CI configuration
Pipeline #1229 failed
Showing
with 2 additions and 15 deletions
...@@ -3,6 +3,7 @@ upstream_tests: ...@@ -3,6 +3,7 @@ upstream_tests:
image: ghcr.io/puppeteer/puppeteer:latest image: ghcr.io/puppeteer/puppeteer:latest
before_script: before_script:
- npm ci - npm ci
- npm run build
script: script:
- npm run test:ci - npm run test:ci
artifacts: artifacts:
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
} }
</style> </style>
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<h1>This is the first instance</h1> <h1>This is the first instance</h1>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador - Level 0</title> <title>Mirador - Level 0</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
position: relative; position: relative;
} }
</style> </style>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<h1>This is the first instance dir="rtl"</h1> <h1>This is the first instance dir="rtl"</h1>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador - Table of contents</title> <title>Mirador - Table of contents</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador - Prezi v3</title> <title>Mirador - Prezi v3</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<title>Mirador</title> <title>Mirador</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head> </head>
<body> <body>
<div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"lint:containers": "node ./scripts/container-lint.js", "lint:containers": "node ./scripts/container-lint.js",
"lint:translations": "node ./scripts/i18n-lint.js", "lint:translations": "node ./scripts/i18n-lint.js",
"server": "node_modules/.bin/http-server --cors", "server": "node_modules/.bin/http-server --cors",
"test:ci": "jest -c jest.json --ci --reporters=jest-junit --watchAll=false", "test:ci": "jest -c jest.json --ci --reporters=default --reporters=jest-junit --watchAll=false --runInBand",
"test": "npm run build && npm run lint && npm run size && jest -c jest.json", "test": "npm run build && npm run lint && npm run size && jest -c jest.json",
"test:debug": "node --inspect node_modules/.bin/jest -c jest.json --runInBand", "test:debug": "node --inspect node_modules/.bin/jest -c jest.json --runInBand",
"test:watch": "jest -c jest.json --watch", "test:watch": "jest -c jest.json --watch",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment