diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-12-23 12:45:15 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-12-23 12:52:30 +0100 |
| commit | 3659132ff075d23a87696a30ed87fe79e36053eb (patch) | |
| tree | 13eaee4534c4bc8489d1ec82676631945082af7b | |
| parent | 516f42792d9b7d20cba8956d57f0d781f1d8fe33 (diff) | |
try fix ci
| -rw-r--r-- | .github/workflows/cmake-tag.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/cmake.yml | 5 | ||||
| -rw-r--r-- | editor/wall-editor.hpp | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/cmake-tag.yml b/.github/workflows/cmake-tag.yml index 811a4926..a0483c47 100644 --- a/.github/workflows/cmake-tag.yml +++ b/.github/workflows/cmake-tag.yml @@ -18,7 +18,7 @@ jobs: os: [ubuntu-22.04, windows-latest, macos-12] include: - os: ubuntu-22.04 - cmake: /usr/bin/env CC=gcc-12 CXX=g++-12 cmake + cmake: /usr/bin/env CC=gcc-13 CXX=g++-13 cmake - os: macos-12 cmake: /usr/bin/env CC="$(brew --prefix llvm@16)/bin/clang" CXX="$(brew --prefix llvm@16)/bin/clang++" cmake - os: windows-latest @@ -36,8 +36,9 @@ jobs: - name: Install Linux dependencies run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt -q=2 update - sudo apt install g++-12 gdb ninja-build libbenchmark-dev + sudo apt install g++-13 gdb ninja-build libbenchmark-dev sudo apt -q install libgl1-mesa-dri libgl-dev libglx-dev xorg-dev xvfb libopencv-dev sudo apt -q install libsdl2-dev if: matrix.os == 'ubuntu-22.04' diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 6cab8755..22b3a016 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,7 +19,7 @@ jobs: os: [ubuntu-22.04] include: - os: ubuntu-22.04 - cmake: /usr/bin/env CC=gcc-12 CXX=g++-12 cmake + cmake: /usr/bin/env CC=gcc-13 CXX=g++-13 cmake #- os: macos-12 # cmake: /usr/bin/env CC="$(brew --prefix llvm@15)/bin/clang" CXX="$(brew --prefix llvm@15)/bin/clang++" cmake #- os: windows-latest @@ -37,8 +37,9 @@ jobs: - name: Install Linux dependencies run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt -q=2 update - sudo apt install g++-12 gdb ninja-build libbenchmark-dev + sudo apt install g++-13 gdb ninja-build libbenchmark-dev sudo apt -q install libgl1-mesa-dri libgl-dev libglx-dev xorg-dev xvfb libopencv-dev sudo apt -q install libsdl2-dev if: matrix.os == 'ubuntu-22.04' diff --git a/editor/wall-editor.hpp b/editor/wall-editor.hpp index bba395ad..526ac745 100644 --- a/editor/wall-editor.hpp +++ b/editor/wall-editor.hpp @@ -15,7 +15,7 @@ class wall_editor { std::map<StringView, wall_info> _atlases; std::shared_ptr<wall_atlas> _selected_atlas; - rotation _r = rotation::N; + enum rotation _r = rotation::N; void load_atlases(); |