From fd25ae42d0719ab7143c2e1627c95e8c53ea20a7 Mon Sep 17 00:00:00 2001
From: Victor Forsiuk <vvforce@gmail.com>
Date: Thu, 9 Jan 2025 16:56:18 +0200
Subject: [PATCH 1/2] DARKTABLE_CLI env var is only used in darktable-bench, no
 use here

---
 .github/workflows/nightly.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index dd1a668dfe5d..f9a214ab14c7 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -30,7 +30,6 @@ jobs:
       CMAKE_BUILD_TYPE: ${{ matrix.btype }}
       GENERATOR: ${{ matrix.generator }}
       TARGET: ${{ matrix.target }}
-      DARKTABLE_CLI: ${{ github.workspace }}/AppDir/usr/bin/darktable-cli
       BRANCH: ${{ matrix.branch.code }}
       BUILD_NAME: ${{ matrix.branch.label }}
     steps:

From 5db3125eb5478a38d3385c56e5f577e5202a1a92 Mon Sep 17 00:00:00 2001
From: Victor Forsiuk <vvforce@gmail.com>
Date: Thu, 9 Jan 2025 19:59:45 +0200
Subject: [PATCH 2/2] Remove unneeded and not relevant step run conditions

---
 .github/workflows/nightly.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f9a214ab14c7..21727bf7a695 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -140,7 +140,6 @@ jobs:
           cd src
           bash tools/appimage-build-script.sh
       - name: Package upload
-        if: ${{ success() }}
         uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/src/build/Darktable-*.AppImage*
@@ -244,7 +243,6 @@ jobs:
           git submodule update
           popd
       - name: Update lensfun data
-        if: ${{ success() && matrix.btype == 'Release' && matrix.target == 'skiptest' }}
         continue-on-error: true
         run: |
           lensfun-update-data
@@ -254,7 +252,6 @@ jobs:
           cmake -E make_directory "${INSTALL_PREFIX}"
           $(cygpath ${SRC_DIR})/.ci/ci-script.sh
       - name: Package
-        if: ${{ success() && matrix.btype == 'Release' && matrix.target == 'skiptest' }}
         run: |
           cd "${BUILD_DIR}"
           cmake --build "${BUILD_DIR}" --target package
@@ -264,7 +261,6 @@ jobs:
           echo "VERSION=$(git describe --tags --match release-* | sed 's/^release-//;s/-/+/;s/-/~/;s/rc/~rc/')" >> $GITHUB_ENV
           ([[ ${MSYSTEM_CARCH} == x86_64 ]] && echo "SYSTEM=win64" || echo "SYSTEM=woa64") >> $GITHUB_ENV
       - name: Package upload
-        if: ${{ success() }}
         uses: actions/upload-artifact@v4
         with:
           path: ${{ env.BUILD_DIR }}/darktable-${{ env.VERSION }}-${{ env.SYSTEM }}.exe
@@ -346,7 +342,6 @@ jobs:
           cd ${{ env.SRC_DIR }}
           echo "VERSION=$(git describe --tags --match release-* | sed 's/^release-//;s/-/+/;s/-/~/;s/rc/~rc/')-${{ env.ARCHITECTURE }}" >> $GITHUB_ENV
       - name: Package upload
-        if: ${{ success() }}
         uses: actions/upload-artifact@v4
         with:
           path: ${{ env.INSTALL_PREFIX }}/darktable-${{ env.VERSION }}.dmg