build: 5.8.6-1

lanthora · May 26, 2024 · 1ebc8b5 · 1ebc8b5
1 parent 604a230
commit 1ebc8b5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -22,7 +22,6 @@ jobs:
       uses: msys2/setup-msys2@v2
       with:
         msystem: MINGW64
-        update: true
         install: >-
           mingw-w64-x86_64-cmake
           mingw-w64-x86_64-ninja
@@ -34,29 +33,33 @@ jobs:
           mingw-w64-x86_64-qt6-base
     - name: checkout
       uses: actions/checkout@v4
+    - name: cache
+      uses: actions/cache@v4
+      with:
+        path: build
+        key: ${{ hashFiles('CMakeLists.txt') }}
     - name: build
       shell: msys2 {0}
       run: |
-        cmake -B .Release -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=".Release" -DCMAKE_INSTALL_BINDIR="artifacts"
-        cmake --build .Release
-        cmake --install .Release
+        cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="target" -DCMAKE_INSTALL_BINDIR="artifacts"
+        cmake --build build
+        cmake --install build
     - name: collect
       shell: msys2 {0}
       run: |
-        ./winqtcollect.sh .Release/artifacts/cake.exe .Release/artifacts
-        cp logo.ico .Release
-        cp .Release/_deps/candy-build/src/tun/wintun/bin/amd64/wintun.dll .Release/artifacts
+        ./winqtcollect.sh target/artifacts/cake.exe target/artifacts
+        cp build/_deps/candy-build/src/tun/wintun/bin/amd64/wintun.dll target/artifacts
     - name: upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: cake-portable
-        path: .Release/artifacts
+        path: target/artifacts
     - name: installer
       uses: Minionguyjpro/Inno-Setup-Action@v1.2.4
       with:
-        path: .Release/setup.iss
+        path: build/setup.iss
     - name: upload installer
       uses: actions/upload-artifact@v4
       with:
         name: cake-installer
-        path: .Release/installer
+        path: target/installer
diff --git a/.gitignore b/.gitignore
@@ -60,10 +60,6 @@ CMakeLists.txt.user*
 *.vcxproj
 *vcxproj.*
 
-# MinGW generated files
-*.Debug
-*.Release
-
 # Python byte code
 *.pyc
 
@@ -72,3 +68,7 @@ CMakeLists.txt.user*
 *.dll
 *.exe
 
+# Build
+build
+target
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(cake LANGUAGES CXX)
 
-set (CANDY_VERSION "5.8.5")
+set (CANDY_VERSION "5.8.6")
 set (CAKE_RELEASE "1")
 
 set(CMAKE_AUTOUIC ON)

diff --git a/setup.iss.in b/setup.iss.in
@@ -3,9 +3,9 @@
 #define MyAppPublisher "lanthora"
 #define MyAppURL "https://github.com/lanthora/cake"
 #define MyAppExeName "cake.exe"
-#define MyAppBuildDir "artifacts"
-#define MyAppOutputDir "installer"
-#define MyAppLogo "logo.ico"
+#define MyAppTargetDir "../target"
+#define MyAppOutputDir "../installer"
+#define MyAppLogo "../logo.ico"
 
 [Setup]
 AppId={{5068A825-71E9-41D2-A72D-E7260E187122}
@@ -33,7 +33,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#MyAppBuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppTargetDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#MyAppLogo}"; DestDir: "{app}"; Flags: ignoreversion
 
 [Icons]