patch #64 from Olf0

Author: vasvlad

.github/workflows/build.yml

@@ -1,65 +1,76 @@
-name: Github CI build
+name: GitHub CI build
 
 on: 
   push:
     tags:
-      - '*'
-    pull_request:    
-      branches:
-        - sailfishos
-
+      - 'v*'
 env:
-  RELEASE: 4.5.0.16
+  # For available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
+  OS_VERSION: 4.3.0.12
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    name: Build application
+    strategy:
+      matrix:
+        arch: ['i486', 'armv7hl', 'aarch64']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - name: Prepare
-      run: mkdir output
-      
-    - name: Build armv7hl
-      id: build_armv7hl
-      uses: coderus/github-sfos-build@master
-      with:
-        release: ${{ env.RELEASE }}
-        arch: armv7hl
-
-    - name: Build aarch64
-      id: build_aarch64
-      uses: coderus/github-sfos-build@master
-      with:
-        release: ${{ env.RELEASE }}
-        arch: aarch64
-
-
-    - name: Build i486
-      id: build_i486
-      uses: coderus/github-sfos-build@master
-      with:
-        release: ${{ env.RELEASE }}
-        arch: i486
-      
-    - name: Upload build result
-      uses: actions/upload-artifact@v2
-      with:
-        name: output-rpms
-        path: RPMS
-
-    - name: Create release
-      if: contains(github.ref, 'release')
+    - name: Build ${{ matrix.arch }} on ${{ OS_VERSION }}
       run: |
         set -x
-        assets=()
-        for asset in RPMS/*.rpm; do
-          assets+=("-a" "$asset")
-        done
-        tag_name="${GITHUB_REF##*/}"
-        hub release create "${assets[@]}" -m "$tag_name" "$tag_name"
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
+        mkdir -p output
+        docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$OS_VERSION /bin/sh -xc '
+           mkdir -p build
+           cd build
+           cp -r /share/. .
+           mb2 -t SailfishOS-$1-$2 build -d
+           sudo cp -r RPMS/*.rpm /share/output/' sh_mb2 $OS_VERSION ${{ matrix.arch }}
+      
+    - name: Upload RPM (${{ matrix.arch }})
+      uses: actions/upload-artifact@v3
+      with:
+        name: rpm-${{ matrix.arch }}
+        path: output
+  release:
+    name: Release
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download armv7hl
+        uses: actions/download-artifact@v3
+        with:
+          name: rpm-armv7hl
+        continue-on-error: true
+      - name: Download aarch64
+        uses: actions/download-artifact@v3
+        with:
+          name: rpm-aarch64
+        continue-on-error: true
+      - name: Download i486
+        uses: actions/download-artifact@v3
+        with:
+          name: rpm-i486
+        continue-on-error: true
+      - name: Extract Version Name
+        id: extract_name
+        uses: actions/github-script@v4
+        with:
+          result-encoding: string
+          script: |
+            return context.payload.ref.replace(/refs\/tags\//, '');
+      - name: Create a Release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          name: ${{ steps.extract_name.outputs.result }}
+          draft: false
+          prerelease: false
+          body: This release was autogenerated.
+          files: '*.rpm'