From 56c2a78d2bacf2597b3e2bd5a4074e393d7a7149 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Mon, 17 Jun 2024 23:33:13 +0700 Subject: [PATCH] fix CI compilers --- .github/workflows/darwin.yml | 4 ++-- .github/workflows/linux.yml | 4 ++-- develop/untests/meta_issues/github_discussion_88.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/darwin.yml b/.github/workflows/darwin.yml index 2151810..c865cf5 100644 --- a/.github/workflows/darwin.yml +++ b/.github/workflows/darwin.yml @@ -13,8 +13,8 @@ jobs: - { os: "macos-12", xcode: "13.4.1", arch: "x64" } - { os: "macos-13", xcode: "14.3.1", arch: "x64" } - { os: "macos-13", xcode: "14.3.1", arch: "arm64" } - - { os: "macos-14", xcode: "15.2", arch: "x64" } - - { os: "macos-14", xcode: "15.2", arch: "arm64" } + - { os: "macos-14", xcode: "15.4", arch: "x64" } + - { os: "macos-14", xcode: "15.4", arch: "arm64" } name: "xcode-${{matrix.config.xcode}}-${{matrix.config.arch}}" steps: - name: Setup diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bc1a603..68f3f1b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,8 +12,8 @@ jobs: # https://github.com/actions/runner-images/tree/main/images/ubuntu - { os: "ubuntu-20.04", cc: "gcc-10", cxx: "g++-10" } - { os: "ubuntu-20.04", cc: "clang-10", cxx: "clang++-10" } - - { os: "ubuntu-22.04", cc: "gcc-13", cxx: "g++-13" } - - { os: "ubuntu-22.04", cc: "clang-15", cxx: "clang++-15" } + - { os: "ubuntu-24.04", cc: "gcc-14", cxx: "g++-14" } + - { os: "ubuntu-24.04", cc: "clang-18", cxx: "clang++-18" } name: "${{matrix.config.cxx}}" steps: - name: Setup diff --git a/develop/untests/meta_issues/github_discussion_88.cpp b/develop/untests/meta_issues/github_discussion_88.cpp index fc1c9c7..8f1f2f7 100644 --- a/develop/untests/meta_issues/github_discussion_88.cpp +++ b/develop/untests/meta_issues/github_discussion_88.cpp @@ -17,7 +17,7 @@ namespace }; struct position_component : component { - META_HPP_ENABLE_POLY_INFO() + META_HPP_ENABLE_POLY_INFO(component) public: explicit position_component(int nx, int ny) : x{nx}, y{ny} {}