fix github action for pull request

YuriSizuku · Nov 20, 2024 · 977c7e3 · 977c7e3
1 parent be3441d
commit 977c7e3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -31,8 +31,11 @@ jobs:
     
     - name: prepare release
       run: |
-        mv build/TileViewer TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_linux
-        readelf -h TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_linux
+        readelf -h build/TileViewer
+        readelf -a build/TileViewer | grep NEEDED
+        if [[ ! "${{  github.ref_name }}" =~ "merge" ]]; then
+          mv build/TileViewer TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_linux
+        fi
       
     - name: create release
       uses: ncipollo/release-action@v1
@@ -63,15 +66,18 @@ jobs:
     - name: build ${{ matrix.arch.suffix }}
       run: |        
         export DOCKER_ARCH=${{ matrix.arch.prefix }}
-        export BUILD_DIR=${{ matrix.arch.cache }}
+        export BUILD_DIR=${{ matrix.arch.cache }} # this can not change, as the docker cache is here
         export BUILD_TYPE=MinSizeRel
         export USE_BUILDX=1
         bash script/build_docker.sh
     
     - name: prepare release
       run: |
-        mv ${{ matrix.arch.cache }}/TileViewer TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_linux
-        readelf -h TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_linux
+        readelf -h ${{ matrix.arch.cache }}/TileViewer
+        readelf -a ${{ matrix.arch.cache }}/TileViewer | grep NEEDED
+        if [[ ! "${{  github.ref_name }}" =~ "merge" ]]; then
+          mv ${{ matrix.arch.cache }}/TileViewer TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_linux
+        fi
       
     - name: create release
       uses: ncipollo/release-action@v1

diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -39,7 +39,9 @@ jobs:
     
     - name: prepare release
       run: |
-        mv build/TileViewer.exe TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_win.exe
+        if [[ ! "${{  github.ref_name }}" =~ "merge" ]]; then
+          mv build/TileViewer.exe TileViewer_${{  github.ref_name }}_${{ matrix.arch.suffix }}_win.exe
+        fi
       
     - name: create release
       uses: ncipollo/release-action@v1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,13 +59,11 @@ set(INGORED_WARNINGS  "-Wno-unused-command-line-argument -Wno-deprecated-declara
 )
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INGORED_WARNINGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INGORED_WARNINGS}")
-
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 else()
     add_subdirectory(${WXWIDGETS_CODE_DIR})
 endif()
 
-
 # define wxwidgets xrc
 set(wxrc $<TARGET_FILE:wxrc>)
 set(TILEVIEWER_UI_XRC 
@@ -121,10 +119,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 else()
     target_link_libraries(${PROJECT_NAME} PRIVATE
         lua
+        wx::core
         wx::base
         wx::propgrid
     )
 endif()
 
-
 config_platform(${PROJECT_NAME})
diff --git a/Readme.md b/Readme.md
@@ -329,6 +329,7 @@ export DOCKER_ARCH=aarch64 BUILD_DIR=build_linuxa64_docker BUILD_TYPE=MinSizeRel
 ```
 
 ### (3) macOS
+
 ``` sh
 
 # install Xcode Command Line Tools
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     ### (3) macOS
     ``` sh
     # install Xcode Command Line Tools
@@ Expand Down @@