Skip to content

Commit a8bf11b

Browse files
committed
Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle
2 parents 87570a2 + 025d898 commit a8bf11b

40 files changed

+1505
-936
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,31 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- { os: ubuntu-20.04, target: linux, platform: linux-x64,}
18-
- { os: macos-latest, target: darwin, platform: darwin-x64,}
19-
- { os: macos-latest, target: darwin, platform: darwin-arm64}
17+
- { os: ubuntu-20.04, target: linux, platform: linux-x64 }
18+
- { os: ubuntu-22.04, target: linux, platform: linux-aarch64 }
19+
- { os: macos-latest, target: darwin, platform: darwin-x64 }
20+
- { os: macos-latest, target: darwin, platform: darwin-arm64 }
2021
- { os: windows-latest, target: windows, platform: win32-x64 }
2122
steps:
2223
- uses: actions/setup-node@v3
2324
with:
24-
node-version: '16'
25+
node-version: '20'
2526
- uses: actions/checkout@v3
2627
with:
2728
ref: refs/heads/master
28-
- name: install gcc 11
29-
if: startsWith(matrix.os, 'ubuntu')
29+
- name: Prepare Linux-64
30+
if: ${{ matrix.target == 'linux' && matrix.platform == 'linux-x64' }}
3031
run: |
3132
sudo apt-get install -y gcc-11 g++-11
3233
echo "CC=gcc-11" >> $GITHUB_ENV
3334
echo "CXX=g++-11" >> $GITHUB_ENV
35+
- name: Prepare Linux-aarch64
36+
if: ${{ matrix.target == 'linux' && matrix.platform == 'linux-aarch64' }}
37+
run: |
38+
sudo apt-get install -y gcc-11-aarch64-linux-gnu g++-11-aarch64-linux-gnu
39+
echo "CC=aarch64-linux-gnu-gcc-11" >> $GITHUB_ENV
40+
echo "CXX=aarch64-linux-gnu-g++-11" >> $GITHUB_ENV
41+
3442
- name: Build-Windows
3543
if: startsWith(matrix.os, 'windows')
3644
run: |
@@ -40,15 +48,23 @@ jobs:
4048
cmake --build . --config Release
4149
ctest -V -C Release
4250
cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
43-
- name: Build-Linux
44-
if: startsWith(matrix.os, 'ubuntu')
51+
- name: Build-Linux-x64
52+
if: ${{ matrix.platform == 'linux-x64' }}
4553
run: |
4654
mkdir build
4755
cd build
4856
cmake .. -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF -DCMAKE_BUILD_TYPE=Release
4957
cmake --build . --config Release --verbose
5058
ctest -V -C Release
5159
cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
60+
- name: Build-Linux-aarch64
61+
if: ${{ matrix.platform == 'linux-aarch64' }}
62+
run: |
63+
mkdir build
64+
cd build
65+
cmake .. -DBUILD_GMOCK=OFF -DINSTALL_GTEST=OFF -DCMAKE_BUILD_TYPE=Release
66+
cmake --build . --config Release --verbose
67+
cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
5268
- name: Build-macosx
5369
if: startsWith(matrix.os, 'macos')
5470
run: |
@@ -92,6 +108,11 @@ jobs:
92108
chmod 777 linux-x64/bin/CodeFormat
93109
chmod 777 linux-x64/bin/CodeFormatServer
94110
tar -czvf linux-x64.tar.gz linux-x64
111+
- name: tar linux-aarch64
112+
run: |
113+
chmod 777 linux-aarch64/bin/CodeFormat
114+
chmod 777 linux-aarch64/bin/CodeFormatServer
115+
tar -czvf linux-aarch64.tar.gz linux-aarch64
95116
- name: zip darwin-x64
96117
uses: TheDoctor0/[email protected]
97118
with:
@@ -112,7 +133,6 @@ jobs:
112133
chmod 777 darwin-x64/bin/CodeFormat
113134
chmod 777 darwin-x64/bin/CodeFormatServer
114135
tar -czvf darwin-x64.tar.gz darwin-x64
115-
116136
- name: Release
117137
uses: softprops/action-gh-release@v1
118138
if: startsWith(github.ref, 'refs/tags/')
@@ -123,6 +143,7 @@ jobs:
123143
files: |
124144
linux-x64.zip
125145
linux-x64.tar.gz
146+
linux-aarch64.tar.gz
126147
darwin-x64.zip
127148
darwin-arm64.zip
128149
win32-x64.zip

.github/workflows/codestyle.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/setup-node@v3
2222
with:
23-
node-version: '16'
23+
node-version: '20'
2424
- uses: actions/checkout@v3
2525
- name: install gcc 11
2626
if: startsWith(matrix.os, 'ubuntu')

0 commit comments

Comments
 (0)