0.4 prep (#18)

* Created a version header * Testing release workflow
samkusin · Nov 4, 2022 · ec388a5 · ec388a5
1 parent 5a9e0c6
commit ec388a5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -3,8 +3,6 @@ name: CMake
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -2,9 +2,10 @@ name: CMake
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ 'main' ]
+    tags: ['v*']
   pull_request:
-    branches: [ "main" ]
+    branches: [ 'main' ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -30,19 +31,22 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -G "Visual Studio 17 2022" -A x64 -DBUILD_TESTING=OFF
+      run: |
+        echo ${{ github.event_name }}
+        echo ${{ github.ref_name }}
+        echo ${{ github.ref_type }}
+        cmake -B ${{github.workspace}}/build -G "Visual Studio 17 2022" -A x64 -DBUILD_TESTING=OFF
 
     - name: Build
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-    # - name: Archive production artifacts
-    #  uses: actions/upload-artifact@v3
-    #  with:
-    #    name: dist
-    #    path: ${{github.workspace}}/build-run/clemens_iigs/Release/*
-    #    retention-days: 1
-
+    - name: Archive production artifacts
+      if: ${{ github.ref_type == 'tag'}}
+      uses: actions/upload-artifact@v3
+      with:
+        name: clemens-${{github.ref_name}}-${{runner.os}}-${{runner.arch}}.zip
+        path: ${{github.workspace}}/build-run/clemens_iigs/Release/*
 
     # - name: Test
     #  working-directory: ${{github.workspace}}/build

diff --git a/host/clem_front.cpp b/host/clem_front.cpp
@@ -1,3 +1,4 @@
+#include "version.h"
 #include "clem_front.hpp"
 #include "clem_backend.hpp"
 #include "clem_disk_utils.hpp"
@@ -343,7 +344,8 @@ ClemensFrontend::ClemensFrontend(const cinek::ByteBuffer &systemFontLoBuffer,
 
   debugMemoryEditor_.ReadFn = &ClemensFrontend::imguiMemoryEditorRead;
   debugMemoryEditor_.WriteFn = &ClemensFrontend::imguiMemoryEditorWrite;
-  CLEM_TERM_COUT.print(TerminalLine::Info, "Welcome to the Clemens IIgs Emulator");
+  CLEM_TERM_COUT.format(TerminalLine::Info, "Welcome to the Clemens IIgs Emulator {}.{}",
+                        CLEM_HOST_VERSION_MAJOR, CLEM_HOST_VERSION_MINOR);
 }
 
 ClemensFrontend::~ClemensFrontend() {

diff --git a/host/version.h b/host/version.h
@@ -0,0 +1,7 @@
+#ifndef CLEM_HOST_VERSION_H
+#define CLEM_HOST_VERSION_H
+
+#define CLEM_HOST_VERSION_MAJOR 0
+#define CLEM_HOST_VERSION_MINOR 4
+
+#endif