X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=.github%2Fworkflows%2Fmaven.yml;h=d8208abf6351aa0fe7088f62177aa0f3d08df731;hb=e012b8ca6d5496c1b36caebd754ad90750ba9516;hp=b2ee2f04e5e7fe9775c3e577f088e2b9ff39be6d;hpb=57750e8bfbc07521c76521206a2b498d95345299;p=Mograsim.git

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b2ee2f04..d8208abf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -23,22 +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_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
-        echo "${DEPLOY_KEY}" > ~/.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
-        scp -i ~/.ssh/id_rsa_deploy -r releng/net.mograsim.plugin.updatesite/target/repository mograsim@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