From d84c4397a1d89a09c02b25cbb626a7072c3135cf Mon Sep 17 00:00:00 2001
From: Robert van den Breemen <robert@vandenbreemen.net>
Date: Sat, 18 Feb 2023 20:26:02 +0100
Subject: [PATCH] Trying to build a relase system

---
 .github/workflows/release.yml | 24 ++++++++++++++++++++++++
 version.h                     | 14 ++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..966ae55
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,24 @@
+name: release-workflow
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build
+        run: echo ${{ github.sha }} > Release.txt
+      - name: Test
+        run: cat Release.txt
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            Release.txt
+            LICENSE
\ No newline at end of file
diff --git a/version.h b/version.h
index 87d60f7..cf288de 100644
--- a/version.h
+++ b/version.h
@@ -2,6 +2,7 @@
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 10  
 #define _VERSION_PATCH 1
+<<<<<<< Updated upstream
 #define _VERSION_BUILD 2045
 #define _VERSION_GITHASH "867432a"
 //#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
@@ -13,4 +14,17 @@
 #define _SEMVER_FULL "0.10.1+867432a"
 #define _SEMVER_NOBUILD "0.10.1 (11-02-2023)"
 #define _VERSION "0.10.1+867432a (11-02-2023)"
+=======
+#define _VERSION_BUILD 2068
+#define _VERSION_GITHASH "d4d33c7"
+//#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
+#define _VERSION_DATE "18-02-2023"
+#define _VERSION_TIME "19:56:37"
+#define _SEMVER_CORE "0.10.1"
+#define _SEMVER_BUILD "0.10.1+2068"
+#define _SEMVER_GITHASH "0.10.1+d4d33c7"
+#define _SEMVER_FULL "0.10.1+d4d33c7"
+#define _SEMVER_NOBUILD "0.10.1 (18-02-2023)"
+#define _VERSION "0.10.1+d4d33c7 (18-02-2023)"
+>>>>>>> Stashed changes
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver