Tweak and enable snapshots

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index e7c20a13bf944d4d59995ba781848d497e036e9f..726b279133b2922a930a29f1e34477c2d43d3d76 100644 (file)
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -26,6 +26,3 @@ jobs:
           SECRET: ${{ secrets.ELIDRAGON_UPLOAD_TOKEN }}
         run: |
           ./upload.sh
-
-
-

diff --git a/.gitignore b/.gitignore
index 53912a6668aaa072d98a20640c0ffaf9deb70b85..639d6e8424126dc63fbcc89b17dc009df56b282f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-build*/*
+build/*
 !build/debug.sh
 !build/debug_loop.sh
-dragonblocks_alpha*
+snapshot/*

diff --git a/README.md b/README.md
index 4f350609c8552feb73836e197452656580fdc83a..aa88c0da92f95d7dd603522c1d1d9023b2fcf789 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 A multiplayer voxelgame for POSIX systems.
 It has been ported to Linux, Windows, FreeBSD and OpenBSD, but may work on other systems.
 
-Head to <https://www.elidragon.tk/dragonblocks_alpha/> for snapshot and release builds (CURRENTLY DOWN).
+Head to <https://www.elidragon.tk/dragonblocks_alpha/> for snapshot and release builds.
 
 ## Invocation
 

diff --git a/snapshot.sh b/snapshot.sh
index 05e9bd74d3a1b992151be3d4d025b9b6420ce3f1..d1d31a16927924a7ad742e3465c921db3de4fc20 100755 (executable)
--- a/snapshot.sh
+++ b/snapshot.sh
@@ -1,48 +1,49 @@
 #!/bin/bash
 set -e
 
-VERSION=`git tag --points-at HEAD`
-if [[ $VERSION = "" ]]; then
-       VERSION=`git rev-parse --short HEAD`
-fi
+version="$(git describe --tags)"
+
+mkdir "snapshot"
+cd "snapshot"
+
+build="build"
+snapshot="dragonblocks_alpha-$version"
+toolchain=""
+dotexe=""
+dotsh=".sh"
+flags="-Ofast"
 
-BUILD=build-release
-SNAPSHOT=dragonblocks_alpha-$VERSION
-TOOLCHAIN=
-DOTEXE=
-DOTSH=".sh"
-FLAGS="-Ofast"
 if [[ "$1" != "" ]]; then
-       BUILD=build-$1
-       SNAPSHOT=dragonblocks_alpha-$1-$VERSION
-       TOOLCHAIN=$1.cmake
-       DOTEXE=".exe"
-       DOTSH=".bat"
-       FLAGS="$FLAGS -static"
+       build="$build-$1"
+       snapshot="$snapshot-$1"
+       toolchain="$1.cmake"
+       dotexe=".exe"
+       dotsh=".bat"
+       flags="$flags -static"
 fi
 
-mkdir -p $BUILD
+mkdir "$build"
 
-cmake -B $BUILD -S src \
+cmake -B "$build" -S ../src \
        -DCMAKE_BUILD_TYPE="Release" \
        -DASSET_PATH="assets/" \
-       -DCMAKE_C_FLAGS="$FLAGS" \
-       -DCMAKE_CXX_FLAGS="$FLAGS" \
-       -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN"
+       -DCMAKE_C_FLAGS="$flags" \
+       -DCMAKE_CXX_FLAGS="$flags" \
+       -DCMAKE_TOOLCHAIN_FILE="$toolchain"
 
-make --no-print-directory -C $BUILD -j$(nproc)
+make --no-print-directory -C "$build" -j"$(nproc)"
 
-rm -rf $SNAPSHOT
-mkdir $SNAPSHOT
+rm -rf "$snapshot"
+mkdir "$snapshot"
 
 cp -r \
-       assets \
-       $BUILD/dragonblocks_client$DOTEXE \
-       $BUILD/dragonblocks_server$DOTEXE \
-       singleplayer$DOTSH \
-       LICENSE \
-       README.md \
-       $SNAPSHOT
-
-rm -f $SNAPSHOT.zip
-zip -r $SNAPSHOT.zip $SNAPSHOT/*
+       "../assets" \
+       "$build/dragonblocks_client$dotexe" \
+       "$build/dragonblocks_server$dotexe" \
+       "../singleplayer$dotsh" \
+       "../LICENSE" \
+       "../README.md" \
+       "$snapshot"
+
+rm -f "$snapshot.zip"
+zip -r "$snapshot.zip" "$snapshot"/*

diff --git a/src/version.cmake b/src/version.cmake
index 5befe41c558540e4a4a75b05eb5f8e18907f543d..b439e8d09a421669d944267d2183c388f50b7436 100644 (file)
--- a/src/version.cmake
+++ b/src/version.cmake
@@ -1,15 +1,8 @@
-execute_process(COMMAND git tag --points-at HEAD
+execute_process(COMMAND git describe --tags
        OUTPUT_VARIABLE GIT_VERSION
        OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-if("${GIT_VERSION}" STREQUAL "")
-       execute_process(COMMAND git rev-parse --short HEAD
-               OUTPUT_VARIABLE GIT_VERSION
-               OUTPUT_STRIP_TRAILING_WHITESPACE
-       )
-endif()
-
 configure_file(
        version.h.in
        ${BINARY_DIR}/version.h

diff --git a/upload.sh b/upload.sh
index 9cb33a5b9937bea12dba356e340aed4fb271a405..62e17860fed9bf08dd9260684be6399b661e164e 100755 (executable)
--- a/upload.sh
+++ b/upload.sh
@@ -1,19 +1,22 @@
 #!/bin/bash
-echo "Snapshot uploading temporarily disabled"
-exit
+set -e
 
-VERSION=`git tag --points-at HEAD`
-IS_RELEASE="1"
-if [[ $VERSION = "" ]]; then
-       VERSION=`git rev-parse --short HEAD`
-       IS_RELEASE="0"
+name="$(git describe --tags)"
+path="@snapshot/dragonblocks_alpha-$name"
+ref="$(git tag --points-at HEAD)"
+release="1"
+
+if [[ "$ref" == "" ]]; then
+       ref="$(git rev-parse --short HEAD)"
+       release="0"
 fi
 
 curl -f -i -X POST -H "Content-Type: multipart/form-data" \
        -F "secret=$SECRET" \
-       -F "name=$VERSION" \
-       -F "is_release=$IS_RELEASE" \
-       -F "linux=@dragonblocks_alpha-$VERSION.zip" \
-       -F "win32=@dragonblocks_alpha-win32-$VERSION.zip" \
-       -F "win64=@dragonblocks_alpha-win64-$VERSION.zip" \
+       -F "name=$name" \
+       -F "ref=$ref" \
+       -F "release=$release" \
+       -F "Linux=$path.zip" \
+       -F "Win32=$path-win32.zip" \
+       -F "Win64=$path-win64.zip" \
        https://elidragon.tk/dragonblocks_alpha/upload.php