Skip to content

Commit c4682f0

Browse files
committedMay 23, 2020
GitHub Actions上でもDocker上でビルドするよう修正
Signed-off-by: Zenichi Amano <crow.misia@gmail.com>
1 parent 4c5bef8 commit c4682f0

File tree

5 files changed

+6
-19
lines changed

5 files changed

+6
-19
lines changed
 

‎.github/workflows/build.yml

+2-18
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,8 @@ jobs:
1818
- uses: actions/checkout@v1
1919
- name: Disk Cleanup
2020
run: ./disk_cleanup.sh
21-
- name: Output Disk size
22-
run: df -hT
2321
- name: Build
24-
run: make USE_CCACHE=0 ${{ matrix.name }}
25-
timeout-minutes: 120
26-
- name: Output Disk size
27-
run: df -hT
22+
run: make -C docker ${{ matrix.name }}
2823
- name: Upload artifact
2924
uses: actions/upload-artifact@v1
3025
with:
@@ -35,13 +30,8 @@ jobs:
3530
runs-on: macos-latest
3631
steps:
3732
- uses: actions/checkout@v1
38-
- name: Output Disk size
39-
run: df -h
4033
- name: Build
4134
run: make USE_CCACHE=0 macos-x64
42-
timeout-minutes: 120
43-
- name: Output Disk size
44-
run: df -h
4535
- name: Upload artifact
4636
uses: actions/upload-artifact@v1
4737
with:
@@ -55,8 +45,7 @@ jobs:
5545
- name: Disk Cleanup
5646
run: .\disk_cleanup.bat
5747
- name: Build
58-
run: .\build.bat
59-
timeout-minutes: 120
48+
run: .\build.windows.bat
6049
- name: Upload artifact
6150
uses: actions/upload-artifact@v1
6251
with:
@@ -67,13 +56,8 @@ jobs:
6756
runs-on: macos-latest
6857
steps:
6958
- uses: actions/checkout@v1
70-
- name: Output Disk size
71-
run: df -h
7259
- name: Build
7360
run: make USE_CCACHE=0 ios
74-
timeout-minutes: 120
75-
- name: Output Disk size
76-
run: df -h
7761
- name: Upload artifact
7862
uses: actions/upload-artifact@v1
7963
with:

‎build.bat

-1
This file was deleted.

‎build.windows.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
powershell -NoProfile -ExecutionPolicy Unrestricted .\build.windows.ps1

‎build.ps1 ‎build.windows.ps1

File renamed without changes.

‎disk_cleanup.sh

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
df -h
4+
35
# Cache 済み Docker Image の削除
46
docker rmi $(docker images -q -a)
57

@@ -9,3 +11,4 @@ sudo rm -rf /usr/local/share/boost
911
# .Net Core の削除
1012
sudo rm -rf /usr/share/dotnet
1113

14+
df -h

0 commit comments

Comments
 (0)