Merge branch 'dev' into 'main'

Dev fixes for GitHub actions See merge request ebi-biows/jdispatcher-viewers!5
ebi-jdispatcher · Nov 7, 2024 · d2777b7 · d2777b7
2 parents f0fbf8c + 4d80117
commit d2777b7
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: jdispatcher-viewers
 on: [push]
 jobs:
   check:
-    runs-on: node:18.20-alpine3.19
+    runs-on: ubuntu-latest
     steps:
       #----------------------------------------------
       # Check-out repo and set-up python
@@ -13,20 +13,28 @@ jobs:
       # Install Canvas/Fabric dependencies
       #----------------------------------------------
       - name: Install Canvas/Fabric Dependencies
-        run: apk add --no-cache build-base g++ cairo-dev pango-dev jpeg-dev giflib-dev librsvg-dev
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential \
+            g++ libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
       #----------------------------------------------
       # Try a "clean" install (without forcing dependencies)
       #----------------------------------------------
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.20'
       - name: Clean install
         run: npm install --dry-run
       #----------------------------------------------
       # Check if lock-file is compatible with packages.json
       #----------------------------------------------
       - name: Check lockfile
         run: |
-          - npm install --force
-          - git ls-files -m | grep -q package-lock.json && { echo "WARNING - Lock file is outdated!" && exit 1; }
-          - exit 0
+          npm install --force
+          git ls-files -m | grep -q package-lock.json \
+            && { echo "WARNING - Lock file is outdated!" && exit 1; }
+          exit 0
       #----------------------------------------------
       # Run npm audit
       #----------------------------------------------

diff --git a/bin/custom-types.js b/bin/custom-types.js
@@ -20,3 +20,9 @@ export const objectDefaults = {
 export const textDefaults = { ...objectDefaults };
 export const rectDefaults = { ...objectDefaults };
 export const lineDefaults = { ...objectDefaults };
+export function toPositiveNumber(value) {
+    if (value < 0) {
+        throw new Error(`${value} is not a positive number`);
+    }
+    return value;
+}
diff --git a/dist/jd_viewers_0.0.11.bundle.min.js b/dist/jd_viewers_0.0.11.bundle.min.js
diff --git a/dist/jd_viewers_0.0.11.bundle.min.js.LICENSE.txt b/dist/jd_viewers_0.0.11.bundle.min.js.LICENSE.txt
@@ -0,0 +1,32 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*! Fabric.js Copyright 2008-2015, Printio (Juriy Zaytsev, Maxim Chernyak) */
+
+/*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/**
+ * @license
+ * Copyright 2017 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta http-equiv="X-UA-Compatible" content="ie=edge" />
         <title>jdistpatcher-viewers</title>
-        <script type="text/javascript" src="dist/jd_viewers_0.0.9.bundle.min.js" defer></script>
+        <script type="text/javascript" src="dist/jd_viewers_0.0.11.bundle.min.js" defer></script>
         <link rel="stylesheet" href="static/style.css" type="text/css" media="all" />
     </head>
     <body>