Merge branch 'final' into InteractionNodes

SynBioDex · May 3, 2021 · 9c2d3ab · 9c2d3ab
2 parents ebdd355 + aab7a74
commit 9c2d3ab
Show file tree

Hide file tree

Showing 4 changed files with 181 additions and 46 deletions.
diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml
@@ -0,0 +1,24 @@
+name: Build Latest Docker Image
+
+on:
+  push:
+    branches: [ final ]
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    name: Build image and push to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      name: Checkout source code
+    - name: Build the Docker image
+      run: |
+        docker build . --tag synbiohub/sbolcanvas:latest
+    - uses: azure/docker-login@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Push the image to Docker Hub
+      run: |
+        docker push synbiohub/sbolcanvas:latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,25 @@
+name: Build Newest Release Docker Image
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build-and-push:
+    name: Build image and push to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      name: Checkout source code
+    - name: Build the Docker image
+      run: |
+        RELEASE=$(echo $GITHUB_REF | cut -d'/' -f 3)
+        docker build . --tag synbiohub/sbolcanvas:$RELEASE
+    - uses: azure/docker-login@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Push the image to Docker Hub
+      run: |
+        RELEASE=$(echo $GITHUB_REF | cut -d'/' -f 3)
+        docker push synbiohub/sbolcanvas:$RELEASE
diff --git a/SBOLCanvasFrontend/package-lock.json b/SBOLCanvasFrontend/package-lock.json
diff --git a/SBOLCanvasFrontend/package.json b/SBOLCanvasFrontend/package.json
@@ -23,7 +23,7 @@
     "core-js": "^2.5.4",
     "file-saver": "^2.0.2",
     "hammerjs": "^2.0.8",
-    "jquery": "^3.4.0",
+    "jquery": "^3.5.0",
     "material-community-components": "^3.4.0",
     "mxgraph": "^3.9.12",
     "ng-sidebar": "^8.0.0",
@@ -50,7 +50,7 @@
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "node-sass": "^4.13.0",
+    "node-sass": "^4.13.1",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
     "tslint": "~5.11.0",