diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afc9959..062d9a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,35 +82,36 @@ jobs: mv Code-Romeo Code-Juliett/dependencies/Romeo shell: bash - - name: Build shuildJuliett + - name: Build ShuildJuliett working-directory: Code-Juliett run: | - ${{ matrix.c_compiler }} shuildJuliett.c -O3 -o shuildJuliett${{ runner.os == 'Windows' && '.exe' || '' }} + ${{ matrix.c_compiler }} ShuildJuliett.c -O3 -o ShuildJuliett${{ runner.os == 'Windows' && '.exe' || '' }} shell: bash - name: Build Code-Juliett working-directory: Code-Juliett run: | - ./shuildJuliett${{ runner.os == 'Windows' && '.exe' || '' }} ${{ matrix.c_compiler }} ${{ matrix.build_type }} all + ./ShuildJuliett${{ runner.os == 'Windows' && '.exe' || '' }} ${{ matrix.c_compiler }} ${{ matrix.build_type }} all shell: bash - name: Run graphical app working-directory: Code-Juliett run: | - if [ "$RUNNER_OS" == "Linux" ]; then - xvfb-run -a --server-args="-screen 0 1024x768x24" build/${{ matrix.build_type }}/Code-Juliett & + BUILD_DIR="${{ matrix.build_type == 'd' && 'debug' || 'release' }}" + if [ "${{ runner.os }}" == "Linux" ]; then + xvfb-run -a --server-args="-screen 0 1024x768x24" build/$BUILD_DIR/Code-Juliett & APP_PID=$! sleep 5 kill $APP_PID - elif [ "$RUNNER_OS" == "macOS" ]; then - build/${{ matrix.build_type }}/Code-Juliett & + elif [ "${{ runner.os }}" == "macOS" ]; then + build/$BUILD_DIR/Code-Juliett & APP_PID=$! sleep 5 kill $APP_PID - elif [ "$RUNNER_OS" == "Windows" ]; then - ./build/${{ matrix.build_type }}/Code-Juliett.exe & + elif [ "${{ runner.os }}" == "Windows" ]; then + build/$BUILD_DIR/Code-Juliett.exe & APP_PID=$! sleep 5 - taskkill /F /PID $APP_PID + taskkill //F //PID $APP_PID fi shell: bash \ No newline at end of file diff --git a/README.md b/README.md index 62cbfc3..3227358 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,9 @@ sudo apt install libwayland-dev libxkbcommon-dev wayland-protocols libx11-dev li ## Build -* Project uses my own [build library](https://github.com/omerfuyar/shuild) to build all sub dependencies. User just needs to compile the shuildRomeo.c to build static libraries into build/release/. I will use clang for examples but you can use your own (clang/gcc/msvc). +* Project uses my own [build library](https://github.com/omerfuyar/shuild) to build all sub dependencies. User just needs to compile the ShuildRomeo.c to build static libraries into build/release/. I will use clang for examples but you can use your own (clang/gcc/msvc). ``` shell -clang shuildRomeo.c -o shuildRomeo -O3 -./shuildRomeo clang r +clang ShuildRomeo.c -o ShuildRomeo -O3 +./ShuildRomeo clang r ```