Skip to content

Commit 49010e0

Browse files
committed
[UPD] : update github actions for auto upload to draft release
1 parent c4c3c32 commit 49010e0

File tree

11 files changed

+85
-82
lines changed

11 files changed

+85
-82
lines changed

.github/workflows/Leak.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ jobs:
4444
- name: upload artifact
4545
uses: actions/upload-artifact@v4
4646
with:
47-
name: ImGuiFileDialog_App_Unix_${{ matrix.fs }}_FS
48-
path: bin/ImGuiFileDialog_App_Unix
47+
name: ImGuiFileDialog_DemoApp_Leak_Linux_${{ matrix.fs }}_FS
48+
path: bin/ImGuiFileDialog_DemoApp_*

.github/workflows/Linux_Clang.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,14 @@ jobs:
4343
- name: upload artifact
4444
uses: actions/upload-artifact@v4
4545
with:
46-
name: ImGuiFileDialog_App_Linux_${{ matrix.fs }}_FS
47-
path: bin/ImGuiFileDialog_App_Unix
46+
name: ImGuiFileDialog_DemoApp_Linux_${{ matrix.fs }}_FS
47+
path: bin/ImGuiFileDialog_DemoApp_*
48+
- name: Upload to DRAFT release
49+
uses: softprops/action-gh-release@v2
50+
with:
51+
tag_name: nightly-draft
52+
name: Nightly Draft
53+
draft: true
54+
prerelease: false
55+
append_body: true
56+
files: bin/ImGuiFileDialog_DemoApp_*

.github/workflows/Linux_Gcc.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,14 @@ jobs:
4343
- name: upload artifact
4444
uses: actions/upload-artifact@v4
4545
with:
46-
name: ImGuiFileDialog_App_Linux_${{ matrix.fs }}_FS
47-
path: bin/ImGuiFileDialog_App_Unix
46+
name: ImGuiFileDialog_DemoApp_Linux_${{ matrix.fs }}_FS
47+
path: bin/ImGuiFileDialog_DemoApp_*
48+
- name: Upload to DRAFT release
49+
uses: softprops/action-gh-release@v2
50+
with:
51+
tag_name: nightly-draft
52+
name: Nightly Draft
53+
draft: true
54+
prerelease: false
55+
append_body: true
56+
files: bin/ImGuiFileDialog_DemoApp_*

.github/workflows/Osx_Clang.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,14 @@ jobs:
3939
- name: upload artifact
4040
uses: actions/upload-artifact@v4
4141
with:
42-
name: ImGuiFileDialog_App_Linux_${{ matrix.fs }}_FS
43-
path: bin/ImGuiFileDialog_App_Unix
42+
name: ImGuiFileDialog_DemoApp_Osx_${{ matrix.fs }}_FS
43+
path: bin/ImGuiFileDialog_DemoApp_*
44+
- name: Upload to DRAFT release
45+
uses: softprops/action-gh-release@v2
46+
with:
47+
tag_name: nightly-draft
48+
name: Nightly Draft
49+
draft: true
50+
prerelease: false
51+
append_body: true
52+
files: bin/ImGuiFileDialog_DemoApp_*

.github/workflows/Osx_Gcc.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,14 @@ jobs:
3939
- name: upload artifact
4040
uses: actions/upload-artifact@v4
4141
with:
42-
name: ImGuiFileDialog_App_Linux_${{ matrix.fs }}_FS
43-
path: bin/ImGuiFileDialog_App_Unix
42+
name: ImGuiFileDialog_DemoApp_Osx_${{ matrix.fs }}_FS
43+
path: bin/ImGuiFileDialog_DemoApp_*
44+
- name: Upload to DRAFT release
45+
uses: softprops/action-gh-release@v2
46+
with:
47+
tag_name: nightly-draft
48+
name: Nightly Draft
49+
draft: true
50+
prerelease: false
51+
append_body: true
52+
files: bin/ImGuiFileDialog_DemoApp_*

.github/workflows/Win_Msvc.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,14 @@ jobs:
3737
- name: upload artifact
3838
uses: actions/upload-artifact@v4
3939
with:
40-
name: ImGuiFileDialog_App_Win32_${{ matrix.fs }}_FS
41-
path: bin\ImGuiFileDialog_App_Win32.exe
40+
name: ImGuiFileDialog_DemoApp_Win_${{ matrix.fs }}_FS
41+
path: bin/ImGuiFileDialog_DemoApp_*
42+
- name: Upload to DRAFT release
43+
uses: softprops/action-gh-release@v2
44+
with:
45+
tag_name: nightly-draft
46+
name: Nightly Draft
47+
draft: true
48+
prerelease: false
49+
append_body: true
50+
files: bin/ImGuiFileDialog_DemoApp_*

.github/workflows/full_sources.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
name: full_sources
33

44
on:
5+
push:
6+
branches:
7+
- DemoApp
8+
paths-ignore:
9+
- 'cmake/**'
10+
- '.github/**'
11+
- 'doc/**'
12+
- 'samples/**'
513
workflow_dispatch:
614

715
jobs:
@@ -18,7 +26,7 @@ jobs:
1826
- name: upload artifact
1927
uses: actions/upload-artifact@v4
2028
with:
21-
name: ImGuiFileDialog
29+
name: ImGuiFileDialog_sources
2230
path: ${{github.workspace}}
2331

2432

CMakeLists.txt

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ if (UNIX)
3636
endif()
3737

3838
if(USE_CXX_STANDARD_20)
39+
# we can keep the old const char* everywhere
3940
if (MSVC)
40-
add_compile_options(/Zc:char8_t-) # we can keep the old const char* everywhere
41+
add_compile_options(/Zc:char8_t-)
4142
else()
42-
add_compile_options(-fno-char8_t) # we can keep the old const char* everywhere
43+
add_compile_options(-fno-char8_t)
4344
endif()
4445
endif()
4546

@@ -51,6 +52,16 @@ endif()
5152

5253
set(ORIGINAL_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
5354

55+
set(FILESYSTEM_TYPE)
56+
if(USE_STD_FILESYSTEM)
57+
set(FILESYSTEM_TYPE "STD")
58+
elseif(USE_BOOST_FILESYSTEM)
59+
set(FILESYSTEM_TYPE "BOOST")
60+
else()
61+
set(USE_DIRENT_FILESYSTEM ON CACHE BOOL "" FORCE)
62+
set(FILESYSTEM_TYPE "DIRENT")
63+
endif()
64+
5465
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
5566
add_definitions(-DMSVC)
5667
if(USE_CXX_STANDARD_20)
@@ -108,11 +119,6 @@ endif()
108119
source_group(src FILES ${MAIN_SOURCES})
109120
source_group(src\\ImGuiImpl FILES ${IMGUIIMPL_SOURCES})
110121

111-
if (APPLE)
112-
##set(ICON icon.icns)
113-
##set_source_files_properties(icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
114-
endif()
115-
116122
include_directories(
117123
${GLM_INCLUDE_DIR}
118124
${PLOG_INCLUDE_DIR}
@@ -154,7 +160,7 @@ set(SOURCES
154160
if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
155161
add_library(${PROJECT} SHARED ${SOURCES})
156162
else()
157-
add_executable(${PROJECT} MACOSX_BUNDLE ${SOURCES})
163+
add_executable(${PROJECT} ${SOURCES})
158164
endif()
159165

160166
if (LINUX)
@@ -174,25 +180,7 @@ if(UNIX)
174180
target_compile_options(${PROJECT} PUBLIC -Wno-unknown-pragmas)
175181
endif()
176182

177-
if (APPLE)
178-
set_target_properties(${PROJECT}
179-
PROPERTIES
180-
OUTPUT_NAME "${PROJECT}_Macos"
181-
MACOSX_BUNDLE_EXECUTABLE_NAME "${PROJECT}"
182-
MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT}"
183-
FOLDER "${PROJECT}"
184-
##RESOURCE icon.icns
185-
MACOSX_BUNDLE_SHORT_VERSION_STRING ""
186-
MACOSX_BUNDLE_LONG_VERSION_STRING ""
187-
##MACOSX_BUNDLE_ICON_FILE icon.icns
188-
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in")
189-
elseif(WIN32)
190-
set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT}_Win32")
191-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
192-
193-
elseif(UNIX)
194-
set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT}_Unix")
195-
endif()
183+
set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT}_${CMAKE_SYSTEM_NAME}_${FILESYSTEM_TYPE}_FS")
196184

197185
if (USE_STD_FILESYSTEM)
198186
set(CMAKE_CXX_STANDARD 17)

ImGuiFileDialog

MacOSXBundleInfo.plist.in

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)