Merge pull request #2 from kristjanvalur/dev

Dev

Author: kristjanvalur

.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.166.1/containers/ubuntu/.devcontainer/base.Dockerfile
+
+# [Choice] Ubuntu version: bionic, focal
+ARG VARIANT="focal"
+FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends build-essential
+
+

.devcontainer/devcontainer.json

@@ -0,0 +1,29 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.166.1/containers/ubuntu
+{
+	"name": "Ubuntu",
+	"build": {
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick an Ubuntu version: focal, bionic
+		"args": { "VARIANT": "focal" }
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"ms-vscode.cpptools"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

.github/workflows/buildcommit.yml

@@ -0,0 +1,108 @@
+name: build test and commit
+
+on:
+  push:
+    branches: [ master, dev ]
+
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build-linux-gnu:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [AMD64, i386, arm, aarch64]
+        include:
+          - name: i386
+            platformflags: -m32
+          - name: arm
+            platformtools:  arm-linux-gnueabi
+            emulator: qemu-arm
+          - name: aarch64
+            platformtools:  aarch64-linux-gnu
+            emulator: qemu-aarch64
+    # name: build-linux-gnu (${{matrix.name}})
+    env:
+      PLATFORMFLAGS: ${{matrix.platformflags}}
+      PLATFORM_PREFIX: ${{matrix.platformtools}}
+      EMULATOR: ${{matrix.emulator}}
+    steps:
+    - uses: actions/checkout@v2
+    - name: install multilib
+      run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib 
+      if: ${{ matrix.name == 'i386' }}
+    - name: install qemu
+      if: matrix.emulator
+      run: sudo apt-get install --no-install-recommends -y qemu-user 
+    - name: install abi lib
+      if: matrix.platformtools
+      run: sudo apt-get install --no-install-recommends -y gcc-${{matrix.platformtools}} g++-${{matrix.platformtools}} 
+    - name: make
+      run: make all
+    - name: test
+      run: make test
+    - name: set abi name
+      run: echo abiname=$(make abiname) >> $GITHUB_ENV
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.abiname }}
+        path: lib/${{ env.abiname }}/libstackman.a
+      
+  build-windows:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: true
+      matrix:
+        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
+      - uses: microsoft/[email protected]
+      - name: build
+        run: msbuild.exe vs2019\stackman.sln /p:Platform=${{matrix.platform}}
+      - name: strip timestamps from lib
+        run: python tools/strip-lib.py lib/win_${{matrix.platform}}/stackman.lib
+      - name: rebuild after stripping
+        run: msbuild.exe vs2019\stackman.sln /p:Platform=${{matrix.platform}}
+      - name: test
+        if: ${{ matrix.native == 'yes' }}
+        run: vs2019\${{matrix.folder}}\Debug\test.exe
+      - 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]
+    if: ${{ github.event_name == 'push' }}
+    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 '[email protected]'
+        git add lib/*.a lib/*.lib
+        git status
+        git diff-index --quiet HEAD || git commit -m "Automated build"
+        git push

.github/workflows/test.yml

@@ -12,27 +12,31 @@ CXXFLAGS += $(NO_CET)
 
 OLDCC := $(CC)
 ifdef PLATFORM_PREFIX
-CC = $(PLATFORM_PREFIX)gcc
-CXX = $(PLATFORM_PREFIX)g++
-LD = $(PLATFORM_PREFIX)ld
-AR = $(PLATFORM_PREFIX)ar
+CC = $(PLATFORM_PREFIX)-gcc
+CXX = $(PLATFORM_PREFIX)-g++
+LD = $(PLATFORM_PREFIX)-ld
+AR = $(PLATFORM_PREFIX)-ar
 endif
 # run c preprocessor with any cflags to get cross compilation result, then run regular compile in native
-ABI := $(shell ./abiname.sh "$(CC)" "$(CFLAGS)")
+ABI := $(shell sh tools/abiname.sh "$(CC)" "$(CFLAGS)")
 ifndef ABI
 $(error Could not determine platform)
-else
-$(info ABI is $(ABI))
 endif
 
 LIB := lib/$(ABI)
 
 all: $(LIB)/libstackman.a
 
+# echo the abiname, for build tools.
+.PHONY: abiname
+abiname:
+	@echo $(ABI)
+
 obj = stackman/stackman.o stackman/stackman_s.o
 
 
 $(LIB)/libstackman.a: lib $(obj)
+	$(info ABI is $(ABI))
 	$(AR) $(ARFLAGS) -s $@ $(obj)
 
 .PHONY: lib clean
@@ -42,7 +46,7 @@ lib:
 clean:
 	rm -f stackman/*.o tests/*.o
 	rm -f bin/* 
-	rm -rf tmp
+	rm -rf tmp tools/tmp
 
 DEBUG = #-DDEBUG_DUMP