Skip to content

Commit 7e2505e

Browse files
committed
Remove expired runner
1 parent 6238ec8 commit 7e2505e

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ jobs:
9191
cc: gcc
9292
thread_unsafe: 1
9393
configure: "Release"
94-
- os: ubuntu-20.04
95-
triplet: x64-linux
96-
cc: gcc-4.8
9794
- os: ubuntu-latest
9895
triplet: x64-linux
9996
cc: clang-latest
@@ -115,15 +112,7 @@ jobs:
115112
CI_MODE: ${{ matrix.mode }}
116113
CONFIGURATION: ${{ matrix.configure }}
117114
run: |
118-
if [[ "xgcc-4.8" == "x$USE_CC" ]]; then
119-
sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
120-
sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
121-
sudo apt-get update
122-
sudo apt-get install --no-install-recommends --no-install-suggests -y g++-4.8
123-
if [[ "x$CI_MODE" == "x" ]]; then
124-
CI_MODE=gcc.legacy.test
125-
fi
126-
elif [[ "x$USE_CC" =~ xclang.* ]]; then
115+
if [[ "x$USE_CC" =~ xclang.* ]]; then
127116
if [[ "x$CI_MODE" == "x" ]]; then
128117
CI_MODE=clang.test
129118
fi
@@ -146,10 +135,6 @@ jobs:
146135
generator: "Visual Studio 17 2022"
147136
build_shared_libs: "OFF"
148137
platform: x64
149-
- os: windows-2019
150-
generator: "Visual Studio 16 2019"
151-
build_shared_libs: "OFF"
152-
platform: x64
153138
runs-on: ${{ matrix.os }}
154139
steps:
155140
- name: Checkout

README.rst

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,13 @@ CI Job Matrix
5959
+---------------+--------------------+-----------------------+
6060
| Linux | GCC-latest | Thread Unsafe |
6161
+---------------+--------------------+-----------------------+
62-
| Linux | GCC 4.8 | Legacy |
63-
+---------------+--------------------+-----------------------+
6462
| Linux | Clang-latest | With libc++ |
6563
+---------------+--------------------+-----------------------+
6664
| MinGW64 | GCC | Dynamic linking |
6765
+---------------+--------------------+-----------------------+
68-
| Windows | Visual Studio 2019 | Static linking |
69-
+---------------+--------------------+-----------------------+
70-
| Windows | Visual Studio 2019 | Dynamic linking |
66+
| Windows | Visual Studio 2022 | Static linking |
7167
+---------------+--------------------+-----------------------+
72-
| Windows | Visual Studio 2017 | Legacy,Static linking |
68+
| Windows | Visual Studio 2022 | Dynamic linking |
7369
+---------------+--------------------+-----------------------+
7470
| macOS | AppleClang | With libc++ |
7571
+---------------+--------------------+-----------------------+
@@ -341,8 +337,8 @@ FEEDBACK
341337
If you has any question, please create a issue and provide the information of your environments. For example:
342338

343339
+ **OS**: Windows 10 Pro 19041 *(This can be see after running ``msinfo32``)* / Manjaro(Arch) Linux Linux 5.4.39-1-MANJARO
344-
+ **Compiler**: Visual Studio 2019 C++ 16.5.5 with VS 2019 C++ v14.25 or MSVC 1925/ gcc 9.3.0
345-
+ **CMake Commands**: ``cmake .. -G "Visual Studio 16 2019" -A x64 -DLIBCOPP_FCONTEXT_USE_TSX=ON -DPROJECT_ENABLE_UNITTEST=ON -DPROJECT_ENABLE_SAMPLE=ON-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=%cd%/install-prefix`` / ``cmake .. -G Ninja -DLIBCOPP_FCONTEXT_USE_TSX=ON -DPROJECT_ENABLE_UNITTEST=ON -DPROJECT_ENABLE_SAMPLE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/opt/libcopp``
340+
+ **Compiler**: Visual Studio 2022 C++ 17.14.6 with VS 2022 C++ v14.38 or MSVC 1925/ gcc 9.3.0
341+
+ **CMake Commands**: ``cmake .. -G "Visual Studio 17 2022" -A x64 -DLIBCOPP_FCONTEXT_USE_TSX=ON -DPROJECT_ENABLE_UNITTEST=ON -DPROJECT_ENABLE_SAMPLE=ON-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=%cd%/install-prefix`` / ``cmake .. -G Ninja -DLIBCOPP_FCONTEXT_USE_TSX=ON -DPROJECT_ENABLE_UNITTEST=ON -DPROJECT_ENABLE_SAMPLE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/opt/libcopp``
346342
+ **Compile Commands**: ``cmake --build . -j``
347343
+ **Related Environment Variables**: Please provide all the environment variables which will change the cmake toolchain, ``CC`` 、 ``CXX`` 、 ``AR`` and etc.
348344

0 commit comments

Comments
 (0)