Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -94,17 +94,18 @@ npm-packaging:
       echo `pwd`
       (cd dist ; mv *.exe *-mac-x64.zip *.tar.gz ../artifacts)
       echo -e "\e[0Ksection_end:`date +%s`:native_build\e[0K"
-    - |
-      echo -e "\e[0Ksection_start:`date +%s`:rpm_build\r\e[0KBuilding RPM packages"
-      mkdir -p $HOME/rpmbuild/SOURCES
-      cp artifacts/*.tar.gz $HOME/rpmbuild/SOURCES/
-      setarch i386 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.i386.spec
-      setarch x86_64 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.x86_64.spec
-      mv $HOME/rpmbuild/RPMS/i386/*.rpm artifacts/rpm/
-      mv $HOME/rpmbuild/RPMS/x86_64/*.rpm artifacts/rpm/
-      ls -laR artifacts
-      echo -e "\e[0Ksection_end:`date +%s`:rpm_build\r\e[0K"
-      echo "we made packages!"
+    # these RPMs won't work until we get them to bundle NWJS in the package, commenting this section out for now
+    #- |
+    #  echo -e "\e[0Ksection_start:`date +%s`:rpm_build\r\e[0KBuilding RPM packages"
+    #  mkdir -p $HOME/rpmbuild/SOURCES
+    #  cp artifacts/*.tar.gz $HOME/rpmbuild/SOURCES/
+    #  setarch i386 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.i386.spec
+    #  setarch x86_64 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.x86_64.spec
+    #  mv $HOME/rpmbuild/RPMS/i386/*.rpm artifacts/rpm/
+    #  mv $HOME/rpmbuild/RPMS/x86_64/*.rpm artifacts/rpm/
+    #  ls -laR artifacts
+    #  echo -e "\e[0Ksection_end:`date +%s`:rpm_build\r\e[0K"
+    #  echo "we made packages!"
 deb-packaging:
   stage: package
   rules:
@@ -143,7 +144,7 @@ deb-packaging:
       mv ../*.{deb,dsc,buildinfo,tar.xz,changes} artifacts/debian/
       echo -e "\e[0Ksection_end:`date +%s`:debian_build\r\e[0K"
 
-# copy assets to NR0Q's server
+# copy test assets to NR0Q's server
 nr0q_upload_testing:
   stage: deploy
   image: alpine
@@ -152,12 +153,30 @@ nr0q_upload_testing:
   before_script:
     - |
       apk add openssh-client
+      eval $(ssh-agent -s)
+      echo "$NR0Q_SERVER_KEY" | tr -d '\r' | ssh-add -
       mkdir -p ~/.ssh; chmod 700 ~/.ssh
-      echo "$NR0Q_SERVER_KEY" > ~/.ssh/fleetwood
   script:
     - |
       cd artifacts
-      scp -i ~/.ssh/fleetwood -r . gridtracker@35.208.252.126:$CI_COMMIT_TAG/
+      scp -o StrictHostKeyChecking=no ~/.ssh/fleetwood -r ./* gridtracker@35.208.252.126:$CI_COMMIT_TAG/
+
+# copy release assets to NR0Q's server
+nr0q_upload_release:
+  stage: deploy
+  image: alpine
+  rules:
+    - if: '$CI_COMMIT_TAG =~ /^(v).*/ && $NR0Q_SERVER_KEY != ""'
+  before_script:
+    - |
+      apk add openssh-client
+      eval $(ssh-agent -s)
+      echo "$NR0Q_SERVER_KEY" | tr -d '\r' | ssh-add -
+      mkdir -p ~/.ssh; chmod 700 ~/.ssh
+  script:
+    - |
+      cd artifacts
+      scp -o StrictHostKeyChecking=no ~/.ssh/fleetwood -r ./* gridtracker@35.208.252.126:$CI_COMMIT_TAG/
 
 # copy the assets over to our distribution storage (testing, tag = test_.*)
 s3_upload_testing: