Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: 5.8.6-1 #59

Merged
merged 1 commit into from
May 26, 2024
Merged

build: 5.8.6-1 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions .github/workflows/check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -34,29 +33,35 @@ 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
cp logo.ico target
cp build/setup.iss target
- 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: target/setup.iss
- name: upload installer
uses: actions/upload-artifact@v4
with:
name: cake-installer
path: .Release/installer
path: target/installer
27 changes: 16 additions & 11 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
uses: msys2/setup-msys2@v2
with:
msystem: MINGW64
update: true
install: >-
mingw-w64-x86_64-cmake
mingw-w64-x86_64-ninja
Expand All @@ -26,34 +25,40 @@ 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
cp logo.ico target
cp build/setup.iss target
- name: installer
uses: Minionguyjpro/Inno-Setup-Action@v1.2.4
with:
path: .Release/setup.iss
path: target/setup.iss
- name: upload artifact
uses: actions/upload-artifact@v4
with:
name: cake-portable
path: .Release/artifacts
path: target/artifacts
- name: upload installer
uses: actions/upload-artifact@v4
with:
name: cake-installer
path: .Release/installer
path: target/installer
- name: release
uses: softprops/action-gh-release@v2
if: github.event_name == 'release'
with:
files: .Release/installer/*.exe
files: target/installer/*.exe
9 changes: 5 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ CMakeLists.txt.user*
*.vcxproj
*vcxproj.*

# MinGW generated files
*.Debug
*.Release

# Python byte code
*.pyc

Expand All @@ -72,3 +68,8 @@ CMakeLists.txt.user*
*.dll
*.exe

# Build
build
target
installer

2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions setup.iss.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define MyAppPublisher "lanthora"
#define MyAppURL "https://github.com/lanthora/cake"
#define MyAppExeName "cake.exe"
#define MyAppBuildDir "artifacts"
#define MyAppArtifactsDir "artifacts"
#define MyAppOutputDir "installer"
#define MyAppLogo "logo.ico"

Expand Down Expand Up @@ -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: "{#MyAppArtifactsDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#MyAppLogo}"; DestDir: "{app}"; Flags: ignoreversion

[Icons]
Expand Down