8000 Merge branch 'dev' of github.com:kristjanvalur/stackman into dev · stackless-dev/stackman@69c448f · GitHub
[go: up one dir, main page]
Skip to content

Commit 69c448f

Browse files
kristjanvalurkristjanvalur
committed
Merge branch 'dev' of github.com:kristjanvalur/stackman into dev
2 parents bde6ceb + b1f01c2 commit 69c448f

File tree

1 file changed

+35
-53
lines changed

1 file changed

+35
-53
lines changed

‎.github/workflows/buildcommit.yml

Lines changed: 35 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
name: [AMD64, i386, arm]
17-
platformflags: [""]
18-
platformtools: [""]
19-
emulator: [""]
16+
name: [AMD64, i386, arm, aarch64]
2017
include:
2118
- name: i386
2219
platformflags: -m32
2320
- name: arm
2421
platformtools: arm-linux-gnueabi
2522
emulator: qemu-arm
26-
name: build-linux-gnu (${{matrix.name}})
23+
- name: aarch64
24+
platformtools: aarch64-linux-gnu
25+
emulator: qemu-aarch64
26+
# name: build-linux-gnu (${{matrix.name}})
2727
env:
2828
PLATFORMFLAGS: ${{matrix.platformflags}}
29-
PLATFORM_PREFIX: ${{matrix.platformtools}}-
29+
PLATFORM_PREFIX: ${{matrix.platformtools}}
3030
EMULATOR: ${{matrix.emulator}}
3131
steps:
3232
- uses: actions/checkout@v2
@@ -51,69 +51,51 @@ jobs:
5151
name: ${{ env.abiname }}
5252
path: lib/${{ env.abiname }}/libstackman.a
5353

54-
build-linux-arm:
55-
if: 0
56-
runs-on: ubuntu-latest
57-
strategy:
58-
fail-fast: true
59-
matrix:
60-
include:
61-
- arch: arm
62-
emulator: qemu-arm
63-
abi: arm-linux-gnueabi
64-
- arch: aarch64
65-
emulator: qemu-aarch64
66-
abi: aarch64-linux-gnu
67-
name: test-linux-arm (${{matrix.arch}})
68-
env:
69-
PLATFORM_PREFIX: ${{matrix.abi}}-
70-
EMULATOR: ${{matrix.emulator}}
71-
steps:
72-
- uses: actions/checkout@v2
73-
- name: install qemu
74-
run: sudo apt-get install --no-install-recommends -y qemu-user
75-
- name: install abi lib
76-
run: sudo apt-get install --no-install-recommends -y gcc-${{matrix.abi}} g++-${{matrix.abi}}
77-
- name: make
78-
run: make all
79-
- name: test
80-
run: make test
81-
- name: Commit libraries
82-
run: |
83-
git config --global user.name 'Build Runner'
84-
git config --global user.email 'buildrunner@users.noreply.github.com'
85-
git add lib/*.a
86-
git diff-index --quiet HEAD || git commit -m "Automated build"
87-
git push
88-
8954
build-windows:
90-
if: 0
9155
runs-on: windows-2019
9256
strategy:
9357
fail-fast: true
9458
matrix:
95-
platform: [x86, x64, ARM, ARM64]
59+
platform: [x86, x64, arm, arm64]
9660
include:
9761
- platform: x86
9862
folder: Win32
9963
native: yes
10064
- platform: x64
10165
folder: x64
10266
native: yes
67+
- platform: arm
68+
folder: arm
69+
- platform: arm64
70+
folder: arm64
71+
10372
steps:
10473
- uses: actions/checkout@v2
105-
- name: Add msbuild to PATH
106-
uses: microsoft/setup-msbuild@v1.0.2
74+
- uses: microsoft/setup-msbuild@v1.0.2
10775
- name: build
10876
run: msbuild.exe vs2019\stackman.sln /p:Platform=${{matrix.platform}}
10977
- name: test
11078
if: ${{ matrix.native == 'yes' }}
11179
run: vs2019\${{matrix.folder}}\Debug\test.exe
112-
- name: Commit libraries
113-
run: |
114-
git config --global user.name 'Build Runner'
115-
git config --global user.email 'buildrunner@users.noreply.github.com'
116-
git add lib/*.lib
117-
git diff-index --quiet HEAD || git commit -m "Automated build"
118-
git push
119-
80+
- name: Upload build artifacts
81+
uses: actions/upload-artifact@v2
82+
with:
83+
name: win_${{ matrix.platform }}
84+
path: lib/win_${{matrix.platform}}/stackman.lib
85+
86+
commit-artifacts:
87+
runs-on: ubuntu-latest
88+
needs: [build-linux-gnu, build-windows]
89+
steps:
90+
- uses: actions/checkout@v2
91+
- uses: actions/download-artifact@v2
92+
with:
93+
path: lib
94+
95+
- name: Commit changes
96+
run: |
97+
git config --global user.name 'Automation tool'
98+
git config --global user.email 'automation-tool@users.noreply.github.com'
99+
git add lib/*.a lib/*.lib
100+
git diff-index --quiet HEAD || git commit -m "Automated build"
101+

0 commit comments

Comments
 (0)
0