1.4.2 Release Candidate

.github/workflows/build-ubuntu.yml

@@ -6,9 +6,6 @@ on:
       - master
       - v*
 
-    tags:
-      - v*
-
     paths:
       - cmake/**
       - src/**
@@ -29,6 +26,7 @@ jobs:
 
       - name: Install dependencies
         run: >
+          sudo apt-get update &&
           sudo apt-get install git cmake build-essential libluajit-5.1-dev libmysqlclient-dev
           libboost-date-time-dev libboost-system-dev libboost-iostreams-dev libboost-filesystem-dev
           libpugixml-dev libcrypto++-dev libfmt-dev

.github/workflows/build-vcpkg.yml

@@ -6,9 +6,6 @@ on:
       - master
       - v*
 
-    tags:
-      - v*
-
     paths:
       - cmake/**
       - src/**
@@ -85,15 +82,16 @@ jobs:
           echo "CC=${{ matrix.cc }}" >> $GITHUB_ENV
 
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@3f40d51892f553ccc1279e943640527bde14635b
+        uses: lukka/run-vcpkg@v7
         with:
           vcpkgArguments: ${{ matrix.packages }}
           vcpkgDirectory: ${{ runner.workspace }}/vcpkg/
           vcpkgTriplet: ${{ matrix.triplet }}
+          appendedCacheKey: ${{ matrix.name }}${{ matrix.buildtype }}${{ matrix.luajit }}
           vcpkgGitCommitId: 5568f110b509a9fd90711978a7cb76bae75bb092
 
       - name: Build with CMake
-        uses: lukka/run-cmake@37910ad41ea9667b241360328d9414b62c7feee1
+        uses: lukka/run-cmake@v3
         with:
           useVcpkgToolchainFile: true
           buildDirectory: ${{ runner.workspace }}/build
@@ -160,15 +158,16 @@ jobs:
           echo "CC=${{ matrix.cc }}" >> $GITHUB_ENV
 
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@3f40d51892f553ccc1279e943640527bde14635b
+        uses: lukka/run-vcpkg@v7
         with:
           vcpkgArguments: ${{ matrix.packages }}
           vcpkgDirectory: ${{ runner.workspace }}/vcpkg/
           vcpkgTriplet: ${{ matrix.triplet }}
+          appendedCacheKey: ${{ matrix.name }}${{ matrix.buildtype }}${{ matrix.luajit }}
           vcpkgGitCommitId: 5568f110b509a9fd90711978a7cb76bae75bb092
 
       - name: Build with CMake
-        uses: lukka/run-cmake@37910ad41ea9667b241360328d9414b62c7feee1
+        uses: lukka/run-cmake@v3
         with:
           useVcpkgToolchainFile: true
           buildDirectory: ${{ runner.workspace }}/build

.github/workflows/lua-syntax.yml

@@ -5,6 +5,8 @@ on:
     paths:
       - data/**.lua
   push:
+    branches:
+      - master
     paths:
       - data/**.lua
 

.github/workflows/release-vcpkg.yml

@@ -0,0 +1,192 @@
+name: Release builds with vcpkg
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  unix:
+    name: ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.buildtype }}-luajit=${{ matrix.luajit }}
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 8
+      matrix:
+        name: [ubuntu-gcc, macos-clang]
+        buildtype: [Release]
+        luajit: [on]
+        include:
+          - name: ubuntu-gcc
+            os: ubuntu
+            cxx: g++
+            cc: gcc
+            triplet: x64-linux
+            packages: >
+              boost-asio boost-iostreams boost-system boost-filesystem boost-variant boost-lockfree
+              lua libmariadb pugixml cryptopp fmt
+          - name: macos-clang
+            os: macos
+            cxx: clang++
+            cc: clang
+            triplet: x64-osx
+            packages: >
+              boost-asio boost-iostreams boost-system boost-filesystem boost-variant boost-lockfree
+              lua libmariadb pugixml cryptopp fmt
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Unshallow
+        run: git fetch --prune --unshallow
+
+      - name: Get latest CMake
+        # Using 'latest' branch, the latest CMake is installed.
+        uses: lukka/get-cmake@latest
+
+      - name: Ubuntu - install luajit, remove libmysqlclient-dev
+        run: |
+          sudo apt-get install libluajit-5.1-dev
+          sudo apt-get remove -y libmysqlclient-dev
+        if: contains( matrix.os, 'ubuntu')
+
+      - name: MacOS - install luajit pkgconfig
+        run: brew install luajit pkgconfig
+        if: contains( matrix.os, 'macos')
+
+      - name: Set Environment vars
+        run: |
+          echo "CXX=${{ matrix.cxx }}" >> $GITHUB_ENV
+          echo "CC=${{ matrix.cc }}" >> $GITHUB_ENV
+
+      - name: Run vcpkg
+        uses: lukka/run-vcpkg@v7
+        with:
+          vcpkgArguments: ${{ matrix.packages }}
+          vcpkgDirectory: ${{ runner.workspace }}/vcpkg/
+          vcpkgTriplet: ${{ matrix.triplet }}
+          appendedCacheKey: ${{ matrix.name }}${{ matrix.buildtype }}${{ matrix.luajit }}
+          vcpkgGitCommitId: 5568f110b509a9fd90711978a7cb76bae75bb092
+
+      - name: Build with CMake
+        uses: lukka/run-cmake@v3
+        with:
+          useVcpkgToolchainFile: true
+          buildDirectory: ${{ runner.workspace }}/build
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+          cmakeAppendedArgs: '-G Ninja -DCMAKE_BUILD_TYPE="${{ matrix.buildtype }}" -DUSE_LUAJIT="${{ matrix.luajit }}"'
+
+      - name: dir
+        run: find $RUNNER_WORKSPACE
+        shell: bash
+
+      - name: Prepare datapack contents
+        run: |
+          pwd
+          ls -al
+          find . -maxdepth 1 ! -name data ! -name config.lua.dist ! -name key.pem ! -name LICENSE ! -name README.md ! -name schema.sql -exec rm -r {} \;
+          mv ../build/tfs .
+        shell: bash
+
+      - name: Zip the release files
+        uses: thedoctor0/zip-release@master
+        with:
+          type: tar
+          filename: tfs-${{ github.ref_name }}-${{ matrix.name }}.tar.gz
+          path: forgottenserver
+          directory: ../
+
+      - name: Upload release artifact
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: ../tfs-${{ github.ref_name }}-${{ matrix.name }}.tar.gz
+          generateReleaseNotes: true
+          allowUpdates: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  windows:
+    name: ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.buildtype }}-luajit=on
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 8
+      matrix:
+        name: [windows-msvc]
+        buildtype: [Release]
+        include:
+          - name: windows-msvc
+            os: windows
+            cxx: cl.exe
+            cc: cl.exe
+            triplet: x64-windows
+            packages: >
+              boost-asio boost-iostreams boost-system boost-filesystem boost-variant boost-lockfree
+              lua luajit libmariadb pugixml cryptopp fmt
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Unshallow
+        run: git fetch --prune --unshallow
+
+      - name: Get latest CMake
+        # Using 'latest' branch, the latest CMake is installed.
+        uses: lukka/get-cmake@latest
+
+      - name: Windows - remove C:/mysql*
+        run: rm -r -fo C:/mysql*
+
+      - name: Set Environment vars
+        run: |
+          echo "CXX=${{ matrix.cxx }}" >> $GITHUB_ENV
+          echo "CC=${{ matrix.cc }}" >> $GITHUB_ENV
+
+      - name: Run vcpkg
+        uses: lukka/run-vcpkg@v7
+        with:
+          vcpkgArguments: ${{ matrix.packages }}
+          vcpkgDirectory: ${{ runner.workspace }}/vcpkg/
+          vcpkgTriplet: ${{ matrix.triplet }}
+          appendedCacheKey: ${{ matrix.name }}${{ matrix.buildtype }}${{ matrix.luajit }}
+          vcpkgGitCommitId: 5568f110b509a9fd90711978a7cb76bae75bb092
+
+      - name: Build with CMake
+        uses: lukka/run-cmake@v3
+        with:
+          useVcpkgToolchainFile: true
+          buildDirectory: ${{ runner.workspace }}/build
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+          cmakeAppendedArgs: '-G Ninja -DCMAKE_BUILD_TYPE="${{ matrix.buildtype }}" -DUSE_LUAJIT="on"'
+
+      - name: dir
+        run: find $RUNNER_WORKSPACE
+        shell: bash
+
+      - name: Prepare datapack contents
+        run: |
+          pwd
+          ls -al
+          find . -maxdepth 1 ! -name data ! -name config.lua.dist ! -name key.pem ! -name LICENSE ! -name README.md ! -name schema.sql -exec rm -r {} \;
+          mv ../build/tfs.exe* .
+          mv ../build/*.dll .
+        shell: bash
+
+      - name: Zip the release files
+        uses: thedoctor0/zip-release@master
+        with:
+          type: zip
+          filename: tfs-${{ github.ref_name }}-${{ matrix.name }}.zip
+          path: forgottenserver
+          directory: ../
+
+      - name: Upload release artifact
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: ../tfs-${{ github.ref_name }}-${{ matrix.name }}.zip
+          generateReleaseNotes: true
+          allowUpdates: true
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/xml-syntax.yml

@@ -5,6 +5,8 @@ on:
     paths:
       - data/**.xml
   push:
+    branches:
+      - master
     paths:
       - data/**.xml
 

AUTHORS

@@ -0,0 +1,70 @@
+The Forggoten Server contributors/developers
+
+Allan Ference <f.fallen45@gmail.com>
+andypsylon <github.com@tfm24.de>
+Bruno Carvalho <comedinhass@gmail.com>
+brunominervino <brunominervino1993@gmail.com>
+cbrm <eihrenjar@live.com>
+Chandler Gressman <admin@gmghosting.net>
+codinablac <codinablack@gmail.com>
+comedinha <comedinhass@gmail.com>
+conde2 <joao_pc23@hotmail.com>
+cosmosbr <xande1994@terra.com.br>
+Crypton33 <crypton01@gmail.com>
+dalkon <dalkon@live.se>
+Damian Jarek <damian.jarek93@gmail.com>
+Daniel Björkholm <danielbjorkholm@live.se>
+Daniel Speichert <DSpeichert@users.noreply.github.com>
+devcod <mm.chyla@gmail.com>
+djayk1 <shinobiartonline@gmail.com>
+Dominique Verellen <dominique120@users.noreply.github.com>
+Edgar Garcia <zeromiedoproductionss@gmail.com>
+Eduardo Júnio Santos Macêdo <eduardojunio@users.noreply.github.com>
+EPuncker <epuncker@gmail.com>
+Esfomeado <vps1992@live.com.pt>
+EvanMC <evancole82590@gmail.com>
+Faith2531 <Faith2531@users.noreply.github.com>
+Fernando Matos <fernando@pixele.com.br>
+fsbcorrea <fsbcorrea@gmail.com>
+Gustavo <gugahoa@hotmail.com>
+Gustavo Stor <gsa2@cin.ufpe.br>
+Jesus Fernandez <jfevia@gmail.com>
+Jovial1991 <jovial1991@hotmail.com>
+jpmagg <jamison.usa@hotmail.com>
+Kamil Chojnowski <diath@zodiaclabs.org>
+Kamil Wąż <sn3ejk@outlook.com>
+Kornelijus Survila <kornholijo@gmail.com>
+Luckey1729 <admin@gmghosting.net>
+LuisPro <ramayahero@wp.pl>
+Marcin <nekiroboy@gmail.com>
+Marcin Michalski <evulmastah@gmail.com>
+margohq <muno376@gmail.com>
+Mark Samman <mark.samman@gmail.com>
+Markus Elfring <elfring@users.sourceforge.net>
+mattyx14 <martin_jojo@hotmail.com>
+Mithryll <guianm@outlook.com>
+Nailson <nailsonnego@gmail.com>
+nawyrus <nawyrus@users.noreply.github.com>
+nclx <januario.nclx@gmail.com>
+octavio007 <octavioargenis_11@hotmail.com>
+paulosalvatore <paulo.salvatore@hotmail.com.br>
+PrinterLUA <roberto_potrus@hotmail.com>
+Ranieri Althoff <ranisalt@gmail.com>
+raymondtfr <raymond.ek@hotmail.com>
+Rey Aleman <rey.aleman@outlook.com>
+Roland <gunzo@gunzo.eu>
+Ron <elronaldpetit@gmail.com>
+Royalot <Royalot@users.noreply.github.com>
+Sam <sum9900@web.de>
+Shawak <Shawak@users.noreply.github.com>
+Skillert <peter.mollberg@gmail.com>
+Stefan A. Brannfjell <stefan_brannfjell@live.no>
+Techrlz <techrlz@yahoo.com>
+TheSumm <sum9900@web.de>
+Tovar <petertova@hotmail.com>
+tshain <tdshain@gmail.com>
+Turhan Yağız Merpez <yagizmerpez@gmail.com>
+vankk <nwtr.otland@hotmail.com>
+Vichoko <vicenteoyanedel@gmail.com>
+wgrriffel <wgrriffel@gmail.com>
+WibbenZ <wibbenz@gmail.com>

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
-project(tfs)
+project(tfs CXX)
 
 add_subdirectory(src)
 add_executable(tfs ${tfs_SRC})