chore: update antlr version

ApsarasX · ApsarasX · commit 4dab3b9174f1 · 2020-12-04T15:04:09.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,6 +24,9 @@ jobs:
         compiler:
           - { cc: gcc, cxx: g++ }
           - { cc: clang, cxx: clang++ }
+    env:
+      CC: ${{ matrix.compiler.cc }}
+      CXX: ${{ matrix.compiler.cxx }}
     steps:
       - name: Fetch Codebase
         uses: actions/checkout@v2
@@ -32,7 +35,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ github.workspace }}/thirdparty
-          key: ${{ matrix.os }}-${{ matrix.compiler.cc }}-antlr
+          key: ${{ matrix.os }}-${{ matrix.compiler.cc }}-antlr4.9
       - name: Install Prerequirements
         run: |
           sudo wget https://apt.llvm.org/llvm.sh
@@ -41,30 +44,24 @@ jobs:
           sudo apt-get -y install uuid-dev pkg-config doxygen graphviz
       - name: Install Antlr4 and Antlr4 Runtime
         if: steps.cache-antlr.outputs.cache-hit != 'true'
-        env:
-          CC: ${{ matrix.compiler.cc }}
-          CXX: ${{ matrix.compiler.cxx }}
         run: |
-          echo "THREAD_COUNT=$(sudo cat /proc/cpuinfo| grep "processor"| wc -l)" >> $GITHUB_ENV
           sudo mkdir -p thirdparty/antlr && cd thirdparty/antlr
-          sudo wget https://www.antlr.org/download/antlr-4.8-complete.jar
-          sudo wget -O ${{ runner.temp }}/antlr4-src.zip https://www.antlr.org/download/antlr4-cpp-runtime-4.8-source.zip
+          sudo wget https://www.antlr.org/download/antlr-4.9-complete.jar
+          sudo wget -O ${{ runner.temp }}/antlr4-src.zip https://www.antlr.org/download/antlr4-cpp-runtime-4.9-source.zip
           cd ${{ runner.temp }}
           sudo unzip antlr4-src.zip
           sudo mkdir build && cd build
           sudo mkdir -p ${{ github.workspace }}/thirdparty/antlr-runtime
           sudo cmake .. -DANTLR4_INSTALL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/thirdparty/antlr-runtime
-          sudo cmake --build . --target install  -- -j $THREAD_COUNT
+          sudo cmake --build . --target install  -- -j 2
       - name: Move Antlr Runtime into /usr/local
         run: |
           cd ${{ github.workspace }}/thirdparty/antlr-runtime
           sudo cp -r include/* /usr/local/include/
           sudo cp -r lib/* /usr/local/lib/
       - name: CMake Build
-        env:
-          CC: ${{ matrix.compiler.cc }}
-          CXX: ${{ matrix.compiler.cxx }}
         run: |
+          echo "THREAD_COUNT=$(sudo cat /proc/cpuinfo| grep "processor"| wc -l)" >> $GITHUB_ENV
           sudo mkdir cmake-build-debug cmake-build-release
           cd cmake-build-debug
           sudo cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-w" -G "Unix Makefiles" ..
@@ -96,15 +93,15 @@ jobs:
         compiler:
           - { cc: gcc, cxx: g++ }
           - { cc: clang, cxx: clang++ }
+    env:
+      CC: ${{ matrix.compiler.cc }}
+      CXX: ${{ matrix.compiler.cxx }}
     steps:
       - name: Install Prerequirements
         run: brew install antlr antlr4-cpp-runtime doxygen graphviz
       - name: Fetch Codebase
         uses: actions/checkout@v2
       - name: CMake Build
-        env:
-          CC: ${{ matrix.compiler.cc }}
-          CXX: ${{ matrix.compiler.cxx }}
         run: |
           echo "THREAD_COUNT=$(sudo sysctl -n machdep.cpu.thread_count)" >> $GITHUB_ENV
           sudo mkdir cmake-build-debug cmake-build-release
diff --git a/cmake/AddANTLR.cmake b/cmake/AddANTLR.cmake
@@ -1,7 +1,7 @@
 list(APPEND CMAKE_PREFIX_PATH /usr/local/lib/cmake/antlr4)
 
 if (CMAKE_HOST_SYSTEM_NAME STREQUAL Linux)
-    set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.8-complete.jar)
+    set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.9-complete.jar)
 elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
     set(ANTLR4_JAR_LOCATION /usr/local/opt/antlr/antlr-4.9-complete.jar)
 endif ()
