fix the merging of updated dep versions back to master

.github/workflows/CD-publish-deps-image.yml

@@ -10,6 +10,14 @@ on:
   push:
     branches:
       - deps-image
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+      - '.**ignore'
+      - 'docs/**'
+      # TODO: what if package.dependencies, files were updated?
+      # this is meant to avoid triggering the on.push event for the version bump
+      - '**package*.json'
 
 jobs:
   build:
@@ -51,7 +59,6 @@ jobs:
 
       - name: Build image
         run: |
-          # npm ci
           cd container/deps
           ./version.sh -c
 
@@ -69,8 +76,10 @@ jobs:
             docker push ghcr.io/stjude/ppserver:latest
             docker push ghcr.io/stjude/ppfull:latest
 
+            # TODO: !!! fix merging back to master !!!
             echo "merging to master"
-            git checkout master
-            git merge release
+            git fetch --depth=10 origin master:master
+            git switch master
+            git merge deps-image
             git push
           fi

container/deps/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sjcrh/proteinpaint-container",
-	"version": "2.27.2",
+	"version": "2.29.5",
 	"bin": "launch.js",
 	"scripts": {
 		"//": "this dev script is for developing and testing the container itself, not for using the container as a dev environment",
@@ -9,8 +9,8 @@
 		"postinstall": "if [ ! -f ./pack.sh ]; then docker pull ghcr.io/stjude/ppfull:latest; fi"
 	},
 	"containerDeps": {
-		"server": "2.19.1",
-		"front": "2.19.2"
+		"server": "2.29.5",
+		"front": "2.29.5"
 	},
 	"files": [
 		"build.sh",

container/deps/version.sh

@@ -14,5 +14,5 @@ if [[ "$MODE" == "-c" ]]; then
 	echo "committing version changes"
 	git add package.json
 	git commit -m "dep image v$ROOTPKGVER front=$FRONTPKGVER server=$SERVERPKGVER"
-	# this will trigger the CI-publish-deps-image action
+	git push
 fi