diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13bc98d5..68b1866b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,9 +8,6 @@ on: env: APP_ID: org.legoisland.Isle - APT_CACHE_DIRS: | - /var/cache/apt/ - /var/lib/apt/lists/ BUILD_DIR: build jobs: @@ -47,15 +44,6 @@ jobs: ${{ matrix.msys-env }}-clang-tools-extra ${{ (matrix.config && format('{0}-qt6-base', matrix.msys-env)) || '' }} - # Get a small speed up by caching APT repo data between runs - # `apt update` should now only run a full update if the cache is out of date - - name: Cache APT data - uses: actions/cache@v4 - if: ${{ matrix.linux }} - with: - path: ${{ env.APT_CACHE_DIRS }} - key: apt-${{ runner.arch }} - - name: Install Linux dependencies (apt-get) if: ${{ matrix.linux }} run: | @@ -82,14 +70,6 @@ jobs: - uses: actions/checkout@v4 - - name: Cache CMakeCache.txt - uses: actions/cache@v4 - with: - path: ${{ env.BUILD_DIR }}/CMakeCache.txt - key: ${{ matrix.name }}-${{ hashFiles('**/CMakeLists.txt','**/*.cmake') }} - restore-keys: | - ${{ matrix.name }}- - - name: Configure (CMake) run: | ${{ matrix.cmake-wrapper || '' }} cmake -S . -B ${{ env.BUILD_DIR }} -GNinja \ @@ -137,14 +117,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Cache .flatpak-builder - uses: actions/cache@v4 - with: - path: .flatpak-builder - key: ${{ matrix.arch }}-${{ hashFiles('packaging/linux/flatpak/org.legoisland.Isle.json') }} - restore-keys: | - ${{ matrix.arch }}- - - name: Build Flatpak uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt index a7d4c5b5..9586db9d 100644 --- a/packaging/CMakeLists.txt +++ b/packaging/CMakeLists.txt @@ -14,15 +14,6 @@ else() set(SEMANTIC_VERSION "${PROJECT_VERSION}") endif() -# Following block sourced from https://jonathanhamberg.com/post/cmake-embedding-git-hash/ -# Get the latest abbreviated commit hash of the working branch -# execute_process( -# COMMAND git log -1 --format=%h -# WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} -# OUTPUT_VARIABLE GIT_HASH -# OUTPUT_STRIP_TRAILING_WHITESPACE -# ) - if(LINUX) add_subdirectory(linux) endif() \ No newline at end of file diff --git a/packaging/linux/CMakeLists.txt b/packaging/linux/CMakeLists.txt index cd65adf0..3ff0d713 100644 --- a/packaging/linux/CMakeLists.txt +++ b/packaging/linux/CMakeLists.txt @@ -4,16 +4,10 @@ else() set(FLATPAK FALSE) endif() -if(FLATPAK) - set(METADATA_ROOT "$ENV{FLATPAK_DEST}/share") -else() - set(METADATA_ROOT "/usr/share") -endif() - # Injects the required variables into the Desktop and MetaInfo files configure_file(isledecomp.desktop.in "${APP_ID}.desktop" @ONLY) configure_file(isledecomp.metainfo.xml.in "${APP_ID}.metainfo.xml" @ONLY) -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../icons/isle.svg" RENAME "${APP_ID}.svg" DESTINATION "${METADATA_ROOT}/icons/hicolor/scalable/apps/") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${APP_ID}.desktop" DESTINATION "${METADATA_ROOT}/applications/") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${APP_ID}.metainfo.xml" DESTINATION "${METADATA_ROOT}/metainfo/") \ No newline at end of file +install(FILES "../icons/isle.svg" RENAME "${APP_ID}.svg" DESTINATION "share/icons/hicolor/scalable/apps") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${APP_ID}.desktop" DESTINATION "share/applications") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${APP_ID}.metainfo.xml" DESTINATION "share/metainfo")