X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=.github%2Fworkflows%2Fmaven.yml;h=d8208abf6351aa0fe7088f62177aa0f3d08df731;hb=cc22f88b604e495d8fc709e6c5d30b2c68666ef2;hp=f19088122b173157e8c96dafa82deaa2ef41a16d;hpb=07b2e6213511218b6598705e391fa3d38569407b;p=Mograsim.git

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f1908812..d8208abf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -26,21 +26,20 @@ jobs:
         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
+    - 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_KEY: ${{ secrets.DEPLOY_KEY}}
-        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
+        mkdir -p ~/.ssh || { echo Creating '~/.ssh' failed, aborting; exit 1; }
         touch ~/.ssh/id_rsa_deploy
         chmod 600 ~/.ssh/id_rsa_deploy
         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
-        printenv github.env
-        echo ssh -i ~/.ssh/id_rsa_deploy /mograsim/upload_updatesite_finished.sh $date $github.env
+        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