From 6394f59d93d54f60db8bd96dbe52c2e679aa6e95 Mon Sep 17 00:00:00 2001
From: Adam Harrison <adamdharrison@gmail.com>
Date: Mon, 2 Jan 2023 16:05:54 -0500
Subject: Fixed build, and fixed version.

---
 .github/workflows/build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0def4e9..03e2733 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,12 +9,12 @@ jobs:
         uses: actions/checkout@v3
         with: { fetch-depth: 0 }
       - name: Set Environment Variables
-        run: echo VERSION=`git describe --tags | tail -c +2` >> $GITHUB_ENV && echo REV=$((`git describe --tags | sed 's/.*-\([0-9]*\)-.*/\1/' | sed s/^v.*//` + 1)) >> $GITHUB_ENV
+        run: echo VERSION=`git describe --tags --abbrev=0 | tail -c +2` >> $GITHUB_ENV && echo FULL_VERSION=`git describe --tags | tail -c +2` >> $GITHUB_ENV && echo REV=$((`git describe --tags | sed 's/.*-\([0-9]*\)-.*/\1/' | sed s/^v.*//` + 1)) >> $GITHUB_ENV
       - name: Clone Submodules
-        run: git submodule update --init --depth=1 && export VERSION=`git describe --tags | tail -c +2` && export REV=$((`git describe --tags | sed 's/.*-\([0-9]*\)-.*/\1/' | sed s/^v.*//` + 1))
+        run: git submodule update --init --depth=1
       - name: Build Linux
         run: |
-          ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$VERSION-x86_64-linux'"' && tar -czvf lpm-$VERSION-x86_64-linux.tar.gz lpm
+            ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$FULL_VERSION-x86_64-linux'"' && tar -czvf lpm-$FULL_VERSION-x86_64-linux.tar.gz lpm
           cp lpm lpm.x86_64-linux
           cp lpm /tmp/lpm
       - name: Package Debian/Ubuntu
@@ -50,13 +50,13 @@ jobs:
         uses: actions/checkout@v3
         with: { fetch-depth: 0 }
       - name: Set Environment Variables
-        run: echo VERSION=`git describe --tags | tail -c +2` >> $GITHUB_ENV && echo REV=$((`git describe --tags | sed 's/.*-\([0-9]*\)-.*/\1/' | sed s/^v.*//` + 1)) >> $GITHUB_ENV
+        run: echo VERSION=`git describe --tags --abbrev=0 | tail -c +2` >> $GITHUB_ENV && echo FULL_VERSION=`git describe --tags | tail -c +2` >> $GITHUB_ENV && echo REV=$((`git describe --tags | sed 's/.*-\([0-9]*\)-.*/\1/' | sed s/^v.*//` + 1)) >> $GITHUB_ENV
       - name: Clone Submodules
-        run: git submodule update --init --depth=1 && export VERSION=`git describe --tags | tail -c +2` && export REV=$((`git describe --tags | sed 's/.*-\([0-9]*\)-.*/\1/' | sed s/^v.*//` + 1))
+        run: git submodule update --init --depth=1
       - name: Build MacOS 
         env: { GITHUB_TOKEN: "${{ github.token }}" }
         run: |
-          ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$VERSION-x86_64-darwin'"' && tar -czvf lpm-$VERSION-x86_64-darwin.tar.gz lpm
+          ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$FULL_VERSION-x86_64-darwin'"' && tar -czvf lpm-$FULL_VERSION-x86_64-darwin.tar.gz lpm
           cp lpm lpm.x86_64-darwin
           gh release upload continuous *.tar.gz
           if [[ `git tag --points-at HEAD | head -c 1` == "v" ]]; then
-- 
cgit v1.2.3