Skip to content

Commit a3576b3

Browse files
committed
CI: release file name without version
Fix #714
1 parent c5d0d84 commit a3576b3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,10 @@ jobs:
371371
run: ctest
372372

373373
- name: create zip archive
374-
run: 7z a -tzip -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-windows-amd64.zip *.dll fastfetch.exe flashfetch.exe presets
374+
run: 7z a -tzip -mx9 -bd -y fastfetch-windows-amd64.zip *.dll fastfetch.exe flashfetch.exe presets
375375

376376
- name: create 7z archive
377-
run: 7z a -t7z -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-windows-amd64.7z *.dll fastfetch.exe flashfetch.exe presets
377+
run: 7z a -t7z -mx9 -bd -y fastfetch-windows-amd64.7z *.dll fastfetch.exe flashfetch.exe presets
378378

379379
- name: upload artifacts
380380
uses: actions/upload-artifact@v4
@@ -438,10 +438,10 @@ jobs:
438438
run: ctest
439439

440440
- name: create zip archive
441-
run: 7z a -tzip -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-windows-i686.zip *.dll fastfetch.exe flashfetch.exe presets
441+
run: 7z a -tzip -mx9 -bd -y fastfetch-windows-i686.zip *.dll fastfetch.exe flashfetch.exe presets
442442

443443
- name: create 7z archive
444-
run: 7z a -t7z -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-windows-i686.7z *.dll fastfetch.exe flashfetch.exe presets
444+
run: 7z a -t7z -mx9 -bd -y fastfetch-windows-i686.7z *.dll fastfetch.exe flashfetch.exe presets
445445

446446
- name: upload artifacts
447447
uses: actions/upload-artifact@v4
@@ -474,6 +474,7 @@ jobs:
474474
uses: actions/download-artifact@v4
475475

476476
- name: rm old artifacts
477+
if: needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
477478
run: |
478479
rm -rf fastfetch-*-old-*
479480

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,9 +1110,9 @@ install(
11101110

11111111
set(CPACK_GENERATOR "TGZ;ZIP")
11121112
if(APPLE)
1113-
string(TOLOWER "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-macos-universal" CPACK_PACKAGE_FILE_NAME)
1113+
string(TOLOWER "${CMAKE_PROJECT_NAME}-macos-universal" CPACK_PACKAGE_FILE_NAME)
11141114
else() # We don't use this in Windows
1115-
string(TOLOWER "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" CPACK_PACKAGE_FILE_NAME)
1115+
string(TOLOWER "${CMAKE_PROJECT_NAME}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" CPACK_PACKAGE_FILE_NAME)
11161116
endif()
11171117

11181118
if(LINUX)

0 commit comments

Comments
 (0)