Просмотр исходного кода

Sync root files without 'src' with Namecheap master

Yuriy Puchkov 4 лет назад
Родитель
Сommit
5b15007d04
2 измененных файлов с 3 добавлено и 3 удалено
  1. 3 1
      .github/workflows/Windows-pack.yml
  2. 0 2
      CMakeLists.txt

+ 3 - 1
.github/workflows/Windows-pack.yml

@@ -76,7 +76,9 @@ jobs:
           echo ${last_committed_tag:1}
           echo ${last_committed_tag:1}
           echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
           echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
           echo "================================"
           echo "================================"
-          echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
+          # This will allow to build pre-preleases without git tag
+          # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
+          echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
 
 
       - name: Restore from cache and run vcpkg
       - name: Restore from cache and run vcpkg
         uses: lukka/run-vcpkg@v4
         uses: lukka/run-vcpkg@v4

+ 0 - 2
CMakeLists.txt

@@ -39,8 +39,6 @@ set(PROJECT_NAME_CAPITALIZED "Flameshot")
 # This can be read from ${PROJECT_NAME} after project() is called
 # This can be read from ${PROJECT_NAME} after project() is called
 if (APPLE)
 if (APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
-  #  # Required to generate MOC
-  #  add_subdirectory(external/QHotkey)
 endif()
 endif()