Merge pull request #2 from Totto16/improve_ci

Improve CI
Totto16 · Oct 3, 2024 · 0c0baa4 · 0c0baa4
2 parents 22686db + c3cf2b0
commit 0c0baa4
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -101,22 +101,12 @@ jobs:
           choco install pkgconfiglite
           echo "PKG_CONFIG_PATH=C:/lib/pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Append
 
-      - name: Configure
+      - name: Build and Install OOPetris
         run: |
           cd oopetris
-          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' || '' }}
-
-      - name: Build and install Libs
-        if: matrix.config.os != 'ubuntu'
-        run: |
-          cd oopetris
-          meson install -C build
-
-      - name: Build and install Libs (Linux)
-        if: matrix.config.os == 'ubuntu'
-        run: |
-          cd oopetris
-          sudo meson install -C build
+          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' || '' }}
+          ${{ matrix.config.os == 'ubuntu' && 'sudo' || '' }} meson install -C build
+          ${{ matrix.config.os == 'ubuntu' && 'sudo ldconfig' || '' }}
 
       - name: Install Node.js
         uses: actions/setup-node@v4