Skip to content

Commit

Permalink
fix actions
Browse files Browse the repository at this point in the history
Signed-off-by: swurl <[email protected]>
  • Loading branch information
crueter committed Jan 8, 2025
1 parent 5619479 commit 17fce42
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
12 changes: 2 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
include:

- os: ubuntu-20.04
- os: ubuntu-22.04
qt_host: linux
qt_version: '6.8.1'
qt_modules: 'qtmultimedia qtcharts qtwaylandcompositor'
Expand Down Expand Up @@ -52,7 +52,6 @@ jobs:
echo "INSTALL_DIR=${{ github.workspace }}/install" >> $GITHUB_ENV
echo "INSTALL_APPIMAGE_DIR=${{ github.workspace }}/install-appdir" >> $GITHUB_ENV
echo "NTCORE_INSTALL_DIR=${{ github.workspace }}/install-ntcore" >> $GITHUB_ENV
echo "PROTOBUF_INSTALL_DIR=${{ github.workspace }}/install-protobuf" >> $GITHUB_ENV
echo "DATE=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_ENV
- name: Install CMake
Expand Down Expand Up @@ -121,7 +120,7 @@ jobs:
- name: Configure CMake
run: |
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DUSE_SYSTEM_NTCORE=OFF -DUSE_SYSTEM_PROTOBUF=OFF -DBUILD_SHARED_LIBS=OFF
cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DUSE_SYSTEM_NTCORE=OFF -DBUILD_SHARED_LIBS=OFF
- name: Build
run: |
Expand Down Expand Up @@ -179,7 +178,6 @@ jobs:
shell: cmd
run: |
cmake --install ${{ env.BUILD_DIR }}\_deps\ntcore-build --prefix ${{ env.NTCORE_INSTALL_DIR }}
cmake --install ${{ env.BUILD_DIR }}\_deps\protobuf-build --prefix ${{ env.PROTOBUF_INSTALL_DIR }}
mkdir ${{ env.INSTALL_DIR }}
set PATH=%PATH%;"${{ runner.workspace }}\Qt\${{ matrix.qt_version }}\${{ matrix.qt_arch }}\bin"
Expand All @@ -194,12 +192,6 @@ jobs:
cp C:\Windows\System32\ucrtbase.dll ${{ env.INSTALL_DIR }}
)
ls ${{ env.BUILD_DIR }}
cp ${{ env.BUILD_DIR }}\QFRCDashboard.pdb ${{ env.INSTALL_DIR }}
cp ${{ env.PROTOBUF_INSTALL_DIR }}\bin\abseil_dll.dll ${{ env.INSTALL_DIR }}
- name: Package (Windows, Installer)
if: runner.os == 'Windows'
shell: cmd
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ set(CMAKE_CXX_STANDARD 20)
set(CMAKE_AUTORCC ON)

option(USE_SYSTEM_NTCORE OFF "Use the system NTCore (Linux only)")
option(USE_SYSTEM_PROTOBUF OFF "Use the system protobuf (Linux only)")

find_package(Qt6 6.7 REQUIRED COMPONENTS Quick Multimedia QuickControls2 Network)
add_subdirectory(3rd_party EXCLUDE_FROM_ALL)
Expand Down

0 comments on commit 17fce42

Please sign in to comment.