Browse Source

Fix branch/source conflic

Joachim M. Giæver 2 years ago
parent
commit
a574217a18
1 changed files with 2 additions and 2 deletions
  1. 2 2
      snap/snapcraft.yaml

+ 2 - 2
snap/snapcraft.yaml

@@ -60,7 +60,7 @@ parts:
     after: [yarn]
     plugin: dump
     source: https://github.com/zwave-js/zwavejs2mqtt.git
-    source-branch: "zjs-v10"
+      # source-branch: "zjs-v10"
     source-tag: $SNAPCRAFT_PROJECT_VERSION
     build-packages:
       - gcc
@@ -68,7 +68,7 @@ parts:
       - jq
     override-build: |
       # Used when testing an unreleased version of Z-wavejs
-      sed -i 's/"zwave-js".*$/"zwave-js"\: "10.0.0-beta.9-pr-4836-2945d97"/g' ${SNAPCRAFT_PART_BUILD}/package.json
+      #sed -i 's/"zwave-js".*$/"zwave-js"\: "10.0.0-beta.9-pr-4836-2945d97"/g' ${SNAPCRAFT_PART_BUILD}/package.json
       if [ -n "${http_proxy-}" ]; then
         yarn config set httpProxy "${http_proxy}"
       fi