Change luajit to install by vcpkg manifest (#403)

Remove appveyor build Remove build windows 2019 and ubuntu 18 Added ubuntu 22.04 build
opentibiabr · Jun 6, 2022 · 5fc2834 · 5fc2834
1 parent b0538c4
commit 5fc2834
Show file tree

Hide file tree

Showing 15 changed files with 105 additions and 269 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/analysis-codeql.yml b/.github/workflows/analysis-codeql.yml
@@ -38,8 +38,7 @@ jobs:
       - name: Install Linux Dependencies
         if: ${{ matrix.language == 'cpp' }}
         run: >
-          sudo apt-get update && sudo apt-get install ccache build-essential
-          libluajit-5.1-dev zip
+          sudo apt-get update && sudo apt-get install ccache linux-headers-$(uname -r)
 
       - name: Switch to gcc-11
         if: ${{ matrix.language == 'cpp' }}
@@ -60,7 +59,7 @@ jobs:
         if: ${{ matrix.language == 'cpp' }}
         uses: lukka/run-vcpkg@v10
         with:
-          vcpkgGitCommitId: 773516ecf6014d89cc69b11bb54605ad4be56694
+          vcpkgGitCommitId: 8d41d43e1f7f5933622b02e16430312da649361e
 
       - name: Get latest CMake and ninja
         if: ${{ matrix.language == 'cpp' }}

diff --git a/.github/workflows/analysis-reviewdog.yml b/.github/workflows/analysis-reviewdog.yml
@@ -39,7 +39,7 @@ jobs:
         uses: reviewdog/action-setup@v1
 
       - name: Setup Lua/Luacheck
-        run: sudo apt-get update && sudo apt-get install -y lua5.1 liblua5.1-0-dev lua-check
+        run: sudo apt-get update && sudo apt-get install -y libluajit-5.1-dev lua-check
 
       - name: luac
         env:
@@ -61,7 +61,7 @@ jobs:
         uses: reviewdog/action-setup@v1
 
       - name: Setup Lua/Luacheck
-        run: sudo apt-get update && sudo apt-get install -y lua5.1 liblua5.1-0-dev lua-check
+        run: sudo apt-get update && sudo apt-get install -y libluajit-5.1-dev lua-check
 
       - name: luacheck
         env:

diff --git a/.github/workflows/analysis-sonarcloud.yml b/.github/workflows/analysis-sonarcloud.yml
@@ -34,8 +34,7 @@ jobs:
 
       - name: Install Linux Dependencies
         run: >
-          sudo apt-get update && sudo apt-get install ccache build-essential
-          libluajit-5.1-dev zip
+          sudo apt-get update && sudo apt-get install ccache linux-headers-$(uname -r)
 
       - name: Switch to gcc-11
         run: |
@@ -74,7 +73,7 @@ jobs:
       - name: Restore artifacts, or setup vcpkg (do not install any package)
         uses: lukka/run-vcpkg@v10
         with:
-          vcpkgGitCommitId: 773516ecf6014d89cc69b11bb54605ad4be56694
+          vcpkgGitCommitId: 8d41d43e1f7f5933622b02e16430312da649361e
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -20,22 +20,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-20.04, ubuntu-22.04]
         buildtype: [linux-release, linux-debug]
         include:
-          - os: ubuntu-18.04
-            triplet: x64-linux
           - os: ubuntu-20.04
             triplet: x64-linux
+          - os: ubuntu-22.04
+            triplet: x64-linux
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
       - name: Install Linux Dependencies
         run: >
-          sudo apt-get update && sudo apt-get install ccache build-essential
-          libluajit-5.1-dev zip
+          sudo apt-get update && sudo apt-get install ccache linux-headers-$(uname -r)
 
       - name: Switch to gcc-11
         run: |
@@ -54,7 +53,7 @@ jobs:
       - name: Restore artifacts and install vcpkg
         uses: lukka/run-vcpkg@v10
         with:
-          vcpkgGitCommitId: 773516ecf6014d89cc69b11bb54605ad4be56694
+          vcpkgGitCommitId: 8d41d43e1f7f5933622b02e16430312da649361e
 
       - name: Get latest CMake and ninja
         uses: lukka/get-cmake@latest

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -18,13 +18,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019, windows-2022]
+        os: [windows-2022]
         buildtype: [windows-release, windows-release-asan, windows-debug]
         include:
-          - os: windows-2019
-            triplet: x64-windows
-            packages: >
-              sccache
           - os: windows-2022
             triplet: x64-windows
             packages: >
@@ -50,7 +46,7 @@ jobs:
       - name: Restore artifacts and install vcpkg
         uses: lukka/run-vcpkg@v10
         with:
-          vcpkgGitCommitId: 773516ecf6014d89cc69b11bb54605ad4be56694
+          vcpkgGitCommitId: 8d41d43e1f7f5933622b02e16430312da649361e
 
       - name: Get latest CMake and ninja
         uses: lukka/get-cmake@latest

diff --git a/.github/workflows/tests-lua.yml b/.github/workflows/tests-lua.yml
@@ -20,7 +20,7 @@ jobs:
         run: sudo apt-get update
 
       - name: Setup Lua
-        run: sudo apt-get install -y lua5.1 liblua5.1-0-dev
+        run: sudo apt-get install -y libluajit-5.1-dev
 
       - name: Check out code.
         uses: actions/checkout@v1
diff --git a/README.md b/README.md
@@ -13,9 +13,6 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=opentibiabr_canary&metric=alert_status)](https://sonarcloud.io/dashboard?id=opentibiabr_canary)
 
 ## Builds
-
-[![Build status](https://ci.appveyor.com/api/projects/status/github/opentibiabr/canary?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/opentibiabr/canary/build/artifacts "Download nightly builds for Windows")
-
 [![Build - Ubuntu](https://github.com/opentibiabr/canary/actions/workflows/build-ubuntu.yml/badge.svg)](https://github.com/opentibiabr/canary/actions/workflows/build-ubuntu.yml)
 [![Build - Windows](https://github.com/opentibiabr/canary/actions/workflows/build-windows.yml/badge.svg)](https://github.com/opentibiabr/canary/actions/workflows/build-windows.yml)
 
@@ -42,7 +39,7 @@ You are subject to our code of conduct, read at [this link](https://github.com/o
 ### Getting **Started**
 
 * **WARNING: YOU NEED TO UNZIP THE MAP BEFORE START THE SERVER.**
-* [Compiling on Windows](https://forums.otserv.com.br/index.php?/forums/topic/169235-windowsvc2019-compilando-sources-canary/), alternatively if you are ****not** going to change anything on the source** you can download the latest compiled version for windows from [nightly builds for Windows](https://ci.appveyor.com/project/opentibiabr/canary/build/artifacts).
+* [Compiling on Windows](https://forums.otserv.com.br/index.php?/forums/topic/169235-windowsvc2019-compilando-sources-canary/), alternatively if you are ****not** going to change anything on the source** you can download the latest compiled version for windows from [nightly builds for Windows](https://github.com/opentibiabr/canary/actions/workflows/build-windows.yml?query=branch%3Amain).
 * Wiki: Compiling ([Ubuntu/Debian](https://github.com/opentibiabr/canary/wiki/Compiling-on-Ubuntu-or-Debian-GNU-Linux), [Windows](https://github.com/opentibiabr/canary/wiki/Compiling-on-Windows-(vcpkg)))
 
 ### Issues

diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake