GitHub Actions: post releases

This so far just works on push and hopefullt pull requests, not for tags
and therefore actual releases.

In order not to conflict with the binaries from Travis, I changed the
name to "ci-release" instead of "continuous".

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

4 files changed, 65 insertions, 52 deletions

diff --git a/.github/workflows/in-container-build.sh b/.github/workflows/in-container-build.sh
index 91b3ab81f..8a2b31b59 100644
--- a/.github/workflows/in-container-build.sh
+++ b/.github/workflows/in-container-build.sh
@@ -11,15 +11,24 @@ export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
 export Grantlee5_ROOT=/__w/subsurface/subsurface/install-root
 
 # the container currently has things under / that need to be under /__w/subsurface/subsurface instead
-cp -a /appdir /__w/subsurface/subsurface/
-cp -a /install-root /__w/subsurface/subsurface/
+cp -a /appdir /__w/subsurface/
+cp -a /install-root /__w/subsurface/
+
+echo "--------------------------------------------------------------"
+echo "building mobile"
 
 # first make sure that no one broke Subsurface-mobile
 bash -e -x subsurface/scripts/build.sh -mobile -quick
 
+echo "--------------------------------------------------------------"
+echo "building desktop"
+
 # now build our AppImage
 bash -e -x subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit -quick
 
+echo "--------------------------------------------------------------"
+echo "assembling AppImage"
+
 export QT_PLUGIN_PATH=$QT_ROOT/plugins
 export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
 export QT_DEBUG_PLUGINS=1
diff --git a/.github/workflows/linux-trusty-5.12.yml b/.github/workflows/linux-trusty-5.12.yml
index 9df623aa3..3b6256c8b 100644
--- a/.github/workflows/linux-trusty-5.12.yml
+++ b/.github/workflows/linux-trusty-5.12.yml
@@ -9,19 +9,18 @@ jobs:
 
     steps:
     - name: checkout sources
-      run: |
-        echo $pwd
-        git clone git://github.com/${GITHUB_REPOSITORY}
-        cd subsurface
-        git checkout ${GITHUB_SHA}
+      uses: actions/checkout@v1
 
     - name: run build
       run: |
-        echo $pwd
+        cd ..
         bash -x subsurface/.github/workflows/in-container-build.sh
 
-    - name: publish result
-      uses: actions/upload-artifact@v1
-      with:
-        name: Subsurface-${{github.sha}}.AppImage
-        path: ./Subsurface.AppImage  # /${GITHUB_WORKSPACE}/ in the container is '.' here
+    - name: create CI release
+      uses: ./.github/actions/release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_REPO: ${{ github.repository }}
+        REF: ${{ github.ref }}
+        COMMIT: ${{ github.sha }}
+        BIN1: ./Subsurface.AppImage
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 0b7183c4e..6d3b422d0 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -76,9 +76,30 @@ jobs:
                 ln -s ${GRANTLEE_VERSION}/$(basename $i) .
                 popd
         done
+        zip Subsurface.app.zip Subsurface.app
+    - name: store artifact
+      uses: actions/upload-artifact@master
+      with:
+        name: Subsurface.app.zip
+        path: build/Subsurface.app.zip
 
-    - name: publish result
-      uses: actions/upload-artifact@v1
+  publishRelease:
+    needs: desktopBuild
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: retrieve artifact
+      uses: actions/download-artifact@master
       with:
-        name: Subsurface-GitHub-Build.app
-        path: build/Subsurface.app
+        name: Subsurface.app.zip
+    - name: create CI release
+      uses: ./.github/actions/release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_REPO: ${{ github.repository }}
+        REF: ${{ github.ref }}
+        COMMIT: ${{ github.sha }}
+        BIN1: Subsurface.app.zip
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index bb81e5b28..dd102425f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -9,18 +9,18 @@ jobs:
 
     steps:
     - name: checkout sources
-      run: |
-        cd /win
-        git clone git://github.com/${GITHUB_REPOSITORY}
-        cd subsurface
-        git checkout ${GITHUB_SHA}
-        git submodule init
-        git submodule update
+      uses: actions/checkout@v1
 
     - name: get other dependencies
       run: |
+        echo "creating the link from /win/subsurface"
         cd /win
+        ln -s /__w/subsurface/subsurface .
+        ls -l
+        ls -l subsurface/scripts
+        echo "installing missing container components"
         apt-get install -y ca-certificates libtool
+        echo "downloading sources for fresh build"
         bash subsurface/scripts/get-dep-lib.sh single . libzip
         bash subsurface/scripts/get-dep-lib.sh single . hidapi
         bash subsurface/scripts/get-dep-lib.sh single . googlemaps
@@ -33,32 +33,16 @@ jobs:
         bash -x subsurface/.github/workflows/windows-in-container-build.sh 2>&1 | tee build.log
         grep "Built target installer" build.log
 
-    - name: publish Subsurface installer
-      uses: actions/upload-artifact@v1
-      with:
-        name: subsurface-${{github.sha}}-installer.exe
-        path: ./subsurface-installer.exe  # /${GITHUB_WORKSPACE}/ in the container is '.' here
-
-    - name: publish Subsurface binary
-      uses: actions/upload-artifact@v1
-      with:
-        name: subsurface-${{github.sha}}.exe
-        path: ./subsurface.exe  # /${GITHUB_WORKSPACE}/ in the container is '.' here
-
-    - name: publish Subsurface debug binary
-      uses: actions/upload-artifact@v1
-      with:
-        name: subsurface-${{github.sha}}.exe.debug
-        path: ./subsurface.exe.debug  # /${GITHUB_WORKSPACE}/ in the container is '.' here
-
-    - name: publish smtk2ssrf installer
-      uses: actions/upload-artifact@v1
-      with:
-        name: smtk2ssrf-${{github.sha}}-installer.exe
-        path: ./smtk2ssrf-installer.exe  # /${GITHUB_WORKSPACE}/ in the container is '.' here
+    - name: create CI release
+      uses: ./.github/actions/release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_REPO: ${{ github.repository }}
+        REF: ${{ github.ref }}
+        COMMIT: ${{ github.sha }}
+        BIN1: ./subsurface-installer.exe
+        BIN2: ./subsurface.exe
+        BIN3: ./subsurface.exe.debug
+        BIN4: ./smtk2ssrf-installer.exe
+        BIN5: ./smtk2ssrf.exe
 
-    - name: publish Subsurface installer
-      uses: actions/upload-artifact@v1
-      with:
-        name: smtk2ssrf-${{github.sha}}.exe
-        path: ./subsurface.exe  # /${GITHUB_WORKSPACE}/ in the container is '.' here