X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=.github%2Fworkflows%2Fmaven.yml;h=d5c1ee30b6167e8fd2442cc2fb6b9d3d4bed60dc;hp=9020d22adfb7a574b1e74741ef63f2c2f22ac54e;hb=b16fe399492424fe382f981315dc007216544fea;hpb=46dfdaaef65c90eb12a22356f4ceaefed1d6b709

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9020d22a..d5c1ee30 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -23,25 +23,23 @@ jobs:
       uses: actions/cache@v2.1.1
       with:
         path: ~/.m2/repository
-        key: mograsim-maven-${{ hashFiles('**/pom.xml,**/MANIFEST.MF') }}
+        key: mograsim-maven-${{ hashFiles('**/pom.xml', '**/MANIFEST.MF', '.github/workflows/maven.yml') }}
         restore-keys: |
           mograsim-maven-
-    - name: Build with Maven (mocked)
-      run: |
-        echo mvn --batch-mode --errors --fail-at-end --show-version clean verify --file pom.xml
-        mkdir -p releng/net.mograsim.plugin.updatesite/target/repository/subdir
-        echo "file contents" > releng/net.mograsim.plugin.updatesite/target/repository/somefile.txt
-        echo "another contents" > releng/net.mograsim.plugin.updatesite/target/repository/subdir/somefile2.txt
+    - name: Build with Maven
+      run: mvn --batch-mode --errors --fail-at-end --show-version clean verify --file pom.xml
     - name: Deploy to mograsim.net
       env:
-        DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
-        MOGRASIM_NET_HOST_PUBKEY: ${{ secrets.MOGRASIM_NET_HOST_PUBKEY }}
+        DEPLOY_KEY: ${{secrets.DEPLOY_KEY}}
+        MOGRASIM_NET_HOST_PUBKEY: ${{secrets.MOGRASIM_NET_HOST_PUBKEY }}
+        REF: ${{github.ref}}
       run: |
-        mkdir -p ~/.ssh
-        echo "${DEPLOY_TOKEN}" > ~/.ssh/id_rsa_deploy
+        mkdir -p ~/.ssh || { echo Creating '~/.ssh' failed, aborting; exit 1; }
+        touch ~/.ssh/id_rsa_deploy
         chmod 600 ~/.ssh/id_rsa_deploy
-        echo "${MOGRASIM_NET_HOST_PUBKEY}" >> ~/.ssh/known_hosts
-        ls ~/.ssh
-        cat ~/.ssh/id_rsa_deploy
-        file ~/.ssh/id_rsa_deploy
-        scp -i ~/.ssh/id_rsa_deploy -r releng/net.mograsim.plugin.updatesite/target/repository mograsim.net:mograsim/testdeploy
+        printenv DEPLOY_KEY > ~/.ssh/id_rsa_deploy
+        printenv MOGRASIM_NET_HOST_PUBKEY >> ~/.ssh/known_hosts
+        date=$(date +%Y%m%d_%H%M%S)
+        scp -i ~/.ssh/id_rsa_deploy -r releng/net.mograsim.plugin.updatesite/target/repository mgsdeploy@mograsim.net:/mograsim/upload_tmp/$date
+          || { echo Uploading files failed, aborting; exit 1; }
+        exec ssh -i ~/.ssh/id_rsa_deploy mgsdeploy@mograsim.net /mograsim/upload_updatesite_finished.sh $date $REF