Skip to content

Commit 6de1eca

Browse files
committed
Update Workflow
1 parent e17d0fa commit 6de1eca

File tree

1 file changed

+2
-58
lines changed

1 file changed

+2
-58
lines changed

.github/workflows/ci.yml

+2-58
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
- os: windows-2022
14-
arch: x64
15-
gen_short_name: "vs17_2022"
16-
gen_cmake_name: "Visual Studio 17 2022"
17-
18-
- os: windows-2022
19-
arch: Win32
20-
gen_short_name: "vs17_2022"
21-
gen_cmake_name: "Visual Studio 17 2022"
22-
2313
- os: ubuntu-22.04
2414
arch: x64
2515
cc: gcc
@@ -33,14 +23,6 @@ jobs:
3323
pkgs: gcc-multilib g++-multilib
3424
flags: "-m32"
3525

36-
- os: macos-12
37-
arch: x86_64
38-
gen: Xcode
39-
40-
- os: macos-12
41-
arch: arm64
42-
gen: Xcode
43-
4426
runs-on: ${{ matrix.os }}
4527
steps:
4628
- uses: actions/checkout@v4
@@ -52,7 +34,7 @@ jobs:
5234
run: |
5335
sudo dpkg --add-architecture i386
5436
sudo apt-get update -y
55-
sudo apt-get install ${{ matrix.pkgs }} cmake ninja-build -y
37+
sudo apt-get install ${{ matrix.pkgs }} meson ninja-build -y
5638
5739
- name: Generate Build Files & Build (Linux)
5840
if: ${{ matrix.os == 'ubuntu-22.04' }}
@@ -62,29 +44,7 @@ jobs:
6244
export CXXFLAGS=${{ matrix.flags }}
6345
export CFLAGS=${{ matrix.flags }}
6446
export LDFLAGS=${{ matrix.flags }}
65-
make all GENERATOR=Ninja BUILD_TYPE=Release NUM_JOBS=4
66-
67-
- name: Generate Build Files & Build (Windows)
68-
if: ${{ matrix.os == 'windows-2022' }}
69-
run: |
70-
make all GENERATOR="${{ matrix.gen_cmake_name }}" BUILD_TYPE=Release NUM_JOBS=4 CMAKE_GEN_FLAGS='-A "${{ matrix.arch }}" -T "ClangCL"'
71-
72-
- name: Generate Build Files, Build & Zip (MacOS)
73-
if: ${{ matrix.os == 'macos-12' }}
74-
run: |
75-
make all GENERATOR="${{ matrix.gen }}" BUILD_TYPE=Release NUM_JOBS=4 CMAKE_GEN_FLAGS='-DBUILD_APPLE_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}'
76-
77-
- name: Run Test (Windows)
78-
if: ${{ matrix.os == 'windows-2022' }}
79-
run: ./build/Release/FileSystem_Test.exe
80-
81-
- name: Run Test (Linux)
82-
if: ${{ matrix.os == 'ubuntu-22.04' }}
83-
run: ./build/FileSystem_Test
84-
85-
- name: Run Test (MacOS x86_64 only)
86-
if: ${{ matrix.os == 'macos-12' && matrix.arch == 'x86_64' }}
87-
run: ./build/Release/FileSystem_Test
47+
make all test BUILD_TYPE=release
8848
8949
- name: Upload Artifacts (Linux)
9050
if: ${{ matrix.os == 'ubuntu-22.04' }}
@@ -94,19 +54,3 @@ jobs:
9454
if-no-files-found: error
9555
path: ./build/
9656

97-
- name: Upload artifacts (Windows)
98-
uses: actions/upload-artifact@v3
99-
if: ${{ matrix.os == 'windows-2022' }}
100-
with:
101-
name: win-${{ matrix.arch }}
102-
if-no-files-found: error
103-
path: ./build/
104-
105-
- name: Upload Artifacts (MacOS)
106-
uses: actions/upload-artifact@v3
107-
if: ${{ matrix.os == 'macos-12' }}
108-
with:
109-
name: osx-${{ matrix.arch }}
110-
if-no-files-found: error
111-
path: ./build/
112-

0 commit comments

Comments
 (0)