From 29df5c162baf686dbc3ed5339d88cb61d63d4992 Mon Sep 17 00:00:00 2001 From: oknenavin Date: Fri, 8 Oct 2021 23:07:57 +0300 Subject: [PATCH] - .github: ubuntu-16.04 removed --- .github/workflows/linux.yml | 52 ++++++++++++++++---------------- .github/workflows/time.yml | 60 +++++++++++++------------------------ 2 files changed, 47 insertions(+), 65 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6c1a743d..00b693a0 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -106,19 +106,19 @@ jobs: # clang ###################################################################### - clang-3-5: - runs-on: ubuntu-16.04 - steps: - - uses: actions/checkout@v1 - - name: Compiler setup - run: | - sudo apt-get update - sudo apt-get install clang-3.5 - - name: Check - env: - CXX: clang++-3.5 - CXXFLAGS: -std=c++11 - run: make -j check + #clang-3-5: + # runs-on: ubuntu-16.04 + # steps: + # - uses: actions/checkout@v1 + # - name: Compiler setup + # run: | + # sudo apt-get update + # sudo apt-get install clang-3.5 + # - name: Check + # env: + # CXX: clang++-3.5 + # CXXFLAGS: -std=c++11 + # run: make -j check clang-4: runs-on: ubuntu-18.04 @@ -232,16 +232,16 @@ jobs: CXXFLAGS: -std=c++20 run: make -j check - #clang-12: - # runs-on: ubuntu-20.04 - # steps: - # - uses: actions/checkout@v1 - # - name: Compiler setup - # run: | - # sudo apt-get update - # sudo apt-get install clang-12 - # - name: Check - # env: - # CXX: clang++-12 - # CXXFLAGS: -std=c++20 - # run: make -j check + clang-12: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v1 + - name: Compiler setup + run: | + sudo apt-get update + sudo apt-get install clang-12 + - name: Check + env: + CXX: clang++-12 + CXXFLAGS: -std=c++20 + run: make -j check diff --git a/.github/workflows/time.yml b/.github/workflows/time.yml index 909c66d5..06a8987a 100644 --- a/.github/workflows/time.yml +++ b/.github/workflows/time.yml @@ -86,21 +86,35 @@ jobs: # clang ###################################################################### - clang-3-5: - runs-on: ubuntu-16.04 + #clang-3-5: + # runs-on: ubuntu-16.04 + # steps: + # - uses: actions/checkout@v1 + # - name: Compiler setup + # run: | + # sudo apt-get update + # sudo apt-get install clang-3.5 + # - name: Time + # env: + # CXX: clang++-3.5 + # CXXFLAGS: -DTIME_ONLY -std=c++11 + # run: make time + + clang-4: + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - name: Compiler setup run: | sudo apt-get update - sudo apt-get install clang-3.5 + sudo apt-get install clang-4.0 - name: Time env: - CXX: clang++-3.5 + CXX: clang++-4.0 CXXFLAGS: -DTIME_ONLY -std=c++11 run: make time - clang-11: + clang-12: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 @@ -125,41 +139,9 @@ jobs: - name: Compiler setup run: | sudo apt-get update - sudo apt-get install clang-11 + sudo apt-get install clang-12 - name: Time env: - CXX: clang++-11 + CXX: clang++-12 CXXFLAGS: -I ../../boost.json/include -I ../../rapidjson/include -I ../../nlohmann.json/single_include -DTIME_ONLY -DCOMPARE_WITH_BOOST_JSON -DCOMPARE_WITH_RAPIDJSON -DCOMPARE_WITH_NLOHMANN -std=c++20 run: make time - - #clang-12: - # runs-on: ubuntu-20.04 - # steps: - # - uses: actions/checkout@v1 - # - name: Checkout Boost/JSON - # uses: actions/checkout@v1 - # with: - # repository: boostorg/json - # ref: master - # path: boost.json - # - name: Checkout RapidJSON - # uses: actions/checkout@v1 - # with: - # repository: tencent/rapidjson - # ref: master - # path: rapidjson - # - name: Checkout nlohmann/json - # uses: actions/checkout@v1 - # with: - # repository: nlohmann/json - # ref: master - # path: nlohmann.json - # - name: Compiler setup - # run: | - # sudo apt-get update - # sudo apt-get install clang-12 - # - name: Time - # env: - # CXX: clang++-12 - # CXXFLAGS: -I ../../boost.json/include -I ../../rapidjson/include -I ../../nlohmann.json/single_include -DTIME_ONLY -DCOMPARE_WITH_BOOST_JSON -DCOMPARE_WITH_RAPIDJSON -DCOMPARE_WITH_NLOHMANN -std=c++20 - # run: make time