Skip to content

Commit 0c0baa4

Browse files
authored
Merge pull request #2 from Totto16/improve_ci
Improve CI
2 parents 22686db + c3cf2b0 commit 0c0baa4

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,12 @@ jobs:
101101
choco install pkgconfiglite
102102
echo "PKG_CONFIG_PATH=C:/lib/pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Append
103103
104-
- name: Configure
104+
- name: Build and Install OOPetris
105105
run: |
106106
cd oopetris
107-
meson setup build -Dbuildtype=release -Ddefault_library=static -Dclang_libcpp=${{ matrix.config.os == 'macos' && 'enabled' || 'disabled' }} -Donly_build_libs=true ${{ matrix.config.os == 'windows' && '-Db_vscrt=static_from_buildtype' || '' }}
108-
109-
- name: Build and install Libs
110-
if: matrix.config.os != 'ubuntu'
111-
run: |
112-
cd oopetris
113-
meson install -C build
114-
115-
- name: Build and install Libs (Linux)
116-
if: matrix.config.os == 'ubuntu'
117-
run: |
118-
cd oopetris
119-
sudo meson install -C build
107+
meson setup build -Dbuildtype=release -Ddefault_library=shared -Dclang_libcpp=${{ matrix.config.os == 'macos' && 'enabled' || 'disabled' }} -Donly_build_libs=true ${{ matrix.config.os == 'windows' && '-Db_vscrt=from_buildtype' || '' }}
108+
${{ matrix.config.os == 'ubuntu' && 'sudo' || '' }} meson install -C build
109+
${{ matrix.config.os == 'ubuntu' && 'sudo ldconfig' || '' }}
120110
121111
- name: Install Node.js
122112
uses: actions/setup-node@v4

0 commit comments

Comments
 (0)