Merge pull request #1 from minetest/master

s

Author: SaiPanneerselvam

.github/CONTRIBUTING.md

@@ -19,7 +19,7 @@ Contributions are welcome! Here's how you can help:
    developers.
 
    Any Pull Request that isn't a bug fix and isn't covered by
-   [the roadmap](../doc/direction.md) will be closed within a week unless it
+   [the roadmap](../doc/direction.md) will be closed within a month unless it
    receives a concept approval from a Core Developer. For this reason, it is
    recommended that you open an issue for any such pull requests before doing
    the work, to avoid disappointment.
@@ -30,7 +30,7 @@ Contributions are welcome! Here's how you can help:
 
 3. Start coding!
     - Refer to the
-      [Lua API](https://github.com/minetest/minetest/blob/master/doc/lua_api.txt),
+      [Lua API](https://github.com/minetest/minetest/blob/master/doc/lua_api.md),
       [Developer Wiki](http://dev.minetest.net/Main_Page) and other
       [documentation](https://github.com/minetest/minetest/tree/master/doc).
     - Follow the [C/C++](http://dev.minetest.net/Code_style_guidelines) and
@@ -138,7 +138,7 @@ These notes are for those who have push access Minetest (core developers / maint
 If a Pull Request is not a bug fix:
 
 * If it matches a goal in [the roadmap](../doc/direction.md), then the PR should
-  be labelled as "Roadmap" and the goal stated by number in the description.
+  be labeled as "Roadmap" and the goal stated by number in the description.
 * If it doesn't match a goal, then it needs to receive a concept approval within
   a week of being opened to remain open. This 1 week deadline does not apply to
   PRs opened before the roadmap was adopted; instead, they may remain open or be

.github/workflows/android.yml

@@ -40,3 +40,13 @@ jobs:
       with:
         name: Minetest-arm64-v8a.apk
         path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
+    - name: Save x86 artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: Minetest-x86.apk
+        path: android/app/build/outputs/apk/release/app-x86-release-unsigned.apk
+    - name: Save x86_64 artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: Minetest-x86_64.apk
+        path: android/app/build/outputs/apk/release/app-x86_64-release-unsigned.apk

.github/workflows/build.yml

@@ -29,10 +29,14 @@ on:
       - 'Dockerfile'
       - '.dockerignore'
 
+env:
+  MINETEST_POSTGRESQL_CONNECT_STRING: 'host=localhost user=minetest password=minetest dbname=minetest'
+
 jobs:
   # Older gcc version (should be close to our minimum supported version)
   gcc_5:
     runs-on: ubuntu-18.04
+    if: "false" # FIXME
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
@@ -52,21 +56,21 @@ jobs:
           ./bin/minetest --run-unittests
 
   # Current gcc version
-  gcc_10:
-    runs-on: ubuntu-20.04
+  gcc_12:
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps g++-10
+          install_linux_deps g++-12 libluajit-5.1-dev
 
       - name: Build
         run: |
           ./util/ci/build.sh
         env:
-          CC: gcc-10
-          CXX: g++-10
+          CC: gcc-12
+          CXX: g++-12
 
       - name: Test
         run: |
@@ -75,12 +79,13 @@ jobs:
   # Older clang version (should be close to our minimum supported version)
   clang_3_9:
     runs-on: ubuntu-18.04
+    if: "false" # FIXME
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps clang-3.9 gdb
+          install_linux_deps clang-3.9 valgrind
 
       - name: Build
         run: |
@@ -93,35 +98,34 @@ jobs:
         run: |
           ./bin/minetest --run-unittests
 
-      - name: Integration test + devtest
+      - name: Valgrind
         run: |
-          ./util/test_multiplayer.sh
+          valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/minetest --run-unittests
 
   # Current clang version
-  clang_10:
-    runs-on: ubuntu-20.04
+  clang_14:
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps clang-10 valgrind libluajit-5.1-dev
+          install_linux_deps clang-14 gdb
 
       - name: Build
         run: |
           ./util/ci/build.sh
         env:
-          CC: clang-10
-          CXX: clang++-10
-          CMAKE_FLAGS: "-DREQUIRE_LUAJIT=1"
+          CC: clang-14
+          CXX: clang++-14
 
       - name: Test
         run: |
           ./bin/minetest --run-unittests
 
-      - name: Valgrind
+      - name: Integration test + devtest
         run: |
-          valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/minetest --run-unittests
+          ./util/test_multiplayer.sh
 
   # Build with prometheus-cpp (server-only)
   clang_9_prometheus:

.github/workflows/macos.yml

@@ -28,16 +28,13 @@ env:
 
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
         run: |
-          pkgs=(cmake freetype gettext gmp hiredis jpeg jsoncpp leveldb libogg libpng libvorbis luajit zstd)
-          brew update
-          brew install ${pkgs[@]}
-          brew unlink $(brew ls --formula)
-          brew link ${pkgs[@]}
+          source ./util/ci/common.sh
+          install_macos_deps
 
       - name: Build
         run: |
@@ -49,8 +46,8 @@ jobs:
             -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \
             -DCMAKE_FIND_FRAMEWORK=LAST \
             -DCMAKE_INSTALL_PREFIX=../build/macos/ \
-            -DRUN_IN_PLACE=FALSE \
-            -DENABLE_FREETYPE=TRUE -DENABLE_GETTEXT=TRUE
+            -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE \
+            -DINSTALL_DEVTEST=TRUE
           make -j2
           make install
 

.gitignore

@@ -30,6 +30,13 @@ gtags.files
 build/.cmake/
 # Gradle
 .gradle
+# Clang
+.cache
+# AppImage
+*.AppImage
+*.zsync
+appimage-build
+AppDir
 
 ## Files related to Minetest development cycle
 /*.patch
@@ -41,17 +48,17 @@ build/.cmake/
 /bin/
 /games/*
 !/games/devtest/
+/games/devtest/mods/soundstuff/sounds/gitignored_sounds/*
+!/games/devtest/mods/soundstuff/sounds/gitignored_sounds/custom_sounds_here.txt
 /cache
 /textures/*
 !/textures/base/
 /screenshots
 /sounds
 /mods/*
-!/mods/minetest/
-/mods/minetest/*
-!/mods/minetest/mods_here.txt
-/worlds
-/world/
+!/mods/mods_here.txt
+/worlds/*
+!/worlds/worlds_here.txt
 /clientmods/*
 !/clientmods/preview/
 /client/mod_storage/