Merge branch 'dev' of github.com:kristjanvalur/stackman into dev

Author: kristjanvalur

.github/workflows/buildcommit.yml

@@ -13,20 +13,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [AMD64, i386, arm]
-        platformflags: [""]
-        platformtools: [""]
-        emulator: [""]
+        name: [AMD64, i386, arm, aarch64]
         include:
           - name: i386
             platformflags: -m32
           - name: arm
             platformtools:  arm-linux-gnueabi
             emulator: qemu-arm
-    name: build-linux-gnu (${{matrix.name}})
+          - name: aarch64
+            platformtools:  aarch64-linux-gnu
+            emulator: qemu-aarch64
+    # name: build-linux-gnu (${{matrix.name}})
     env:
       PLATFORMFLAGS: ${{matrix.platformflags}}
-      PLATFORM_PREFIX: ${{matrix.platformtools}}-
+      PLATFORM_PREFIX: ${{matrix.platformtools}}
       EMULATOR: ${{matrix.emulator}}
     steps:
     - uses: actions/checkout@v2
@@ -51,69 +51,51 @@ jobs:
         name: ${{ env.abiname }}
         path: lib/${{ env.abiname }}/libstackman.a
 
-  build-linux-arm:
-    if: 0
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-       include:
-        - arch: arm
-          emulator: qemu-arm
-          abi: arm-linux-gnueabi
-        - arch: aarch64
-          emulator: qemu-aarch64
-          abi: aarch64-linux-gnu
-    name: test-linux-arm (${{matrix.arch}})
-    env:
-      PLATFORM_PREFIX: ${{matrix.abi}}-
-      EMULATOR: ${{matrix.emulator}}
-    steps:
-    - uses: actions/checkout@v2
-    - name: install qemu
-      run: sudo apt-get install --no-install-recommends -y qemu-user 
-    - name: install abi lib
-      run: sudo apt-get install --no-install-recommends -y gcc-${{matrix.abi}} g++-${{matrix.abi}} 
-    - name: make 
-      run: make all
-    - name: test
-      run: make test
-    - name: Commit libraries
-      run: |
-          git config --global user.name 'Build Runner'
-          git config --global user.email 'buildrunner@users.noreply.github.com'
-          git add lib/*.a
-          git diff-index --quiet HEAD || git commit -m "Automated build"
-          git push
-      
   build-windows:
-    if: 0
     runs-on: windows-2019
     strategy:
       fail-fast: true
       matrix:
-        platform: [x86, x64, ARM, ARM64]
+        platform: [x86, x64, arm, arm64]
         include:
           - platform: x86
             folder: Win32
             native: yes
           - platform: x64
             folder: x64
             native: yes
+          - platform: arm
+            folder: arm
+          - platform: arm64
+            folder: arm64
+          
     steps:
       - uses: actions/checkout@v2
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.2
+      - uses: microsoft/setup-msbuild@v1.0.2
       - name: build
         run: msbuild.exe vs2019\stackman.sln /p:Platform=${{matrix.platform}}
       - name: test
         if: ${{ matrix.native == 'yes' }}
         run: vs2019\${{matrix.folder}}\Debug\test.exe
-      - name: Commit libraries
-        run: |
-          git config --global user.name 'Build Runner'
-          git config --global user.email 'buildrunner@users.noreply.github.com'
-          git add lib/*.lib
-          git diff-index --quiet HEAD || git commit -m "Automated build"
-          git push
-
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: win_${{ matrix.platform }}
+          path: lib/win_${{matrix.platform}}/stackman.lib
+  
+  commit-artifacts:
+    runs-on: ubuntu-latest
+    needs: [build-linux-gnu, build-windows]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/download-artifact@v2
+      with:
+        path: lib
+        
+    - name: Commit changes
+      run: |
+        git config --global user.name 'Automation tool'
+        git config --global user.email 'automation-tool@users.noreply.github.com'
+        git add lib/*.a lib/*.lib
+        git diff-index --quiet HEAD || git commit -m "Automated build"
+