some progress

.github/workflows/ci.yml

@@ -60,15 +60,15 @@ jobs:
 
     ## Linux & MacOS-specific build steps
     # Build with premake + make
-    - name: Build (gmake2)
+    - name: Build (gmake)
       if: runner.os != 'Windows'
       run: |
-        premake5 gmake2
+        premake5 gmake
         make clean
-        make all config=${{ matrix.configuration }}_x64
+        make all config=${{ matrix.configuration }}
 
     # Run the tests with sh syntax
-    - name: Test (gmake2)
+    - name: Test (gmake)
       if: runner.os != 'Windows'
       run: ./bin/test
 
@@ -91,4 +91,5 @@ jobs:
     # Run the tests with Powershell syntax
     - name: Test (vs2019)
       if: runner.os == 'Windows'
-      run: "& ./bin/x64/${{ matrix.configuration }}/test.exe"
+      run: "& ./bin/${{ matrix.configuration }}/test.exe"
+

BUILDING.md

@@ -27,7 +27,7 @@ On Linux, depending on your particular distribution there may be prebuilt packag
 
 Now go to the command line under the yojimbo directory and enter:
 
-    premake5 gmake2
+    premake5 gmake
 
 This creates makefiles which you can use to build the source via:
 

docker/Dockerfile

@@ -10,7 +10,7 @@ RUN wget https://github.com/jedisct1/libsodium/releases/download/1.0.16/libsodiu
     tar -zxvf libsodium-*.tar.gz && \
     cd libsodium-* && \
     ./configure && \
-    make -j32 && make check && \
+    make -j && make check && \
     make install && \
     cd .. && \
     rm -rf libsodium* && \
@@ -25,12 +25,12 @@ RUN wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.13.0.tar.gz && \
     tar -zxvf mbedtls-*.tar.gz && \
     cd mbedtls-mbedtls-* && \
     cmake . && \
-    make -j32 && make install && \
+    make -j && make install && \
     ldconfig
 
 ADD yojimbo /app/yojimbo
 
-RUN cd yojimbo && find . -exec touch {} \; && premake5 gmake && make -j32 test server config=release_x64 && ./bin/test && cp /app/yojimbo/bin/* /app && rm -rf yojimbo
+RUN cd yojimbo && find . -exec touch {} \; && premake5 gmake && make -j test server config=release && ./bin/test && cp /app/yojimbo/bin/* /app && rm -rf yojimbo
 
 ENTRYPOINT ./test && ./server