Merge pull request #3323 from mapfish/backport/3320-to-3.29

[Backport 3.29] Cleanup the dpkg diff
mapfish · Jun 7, 2024 · cbb55c9 · cbb55c9
2 parents 0e9531b + 9664472
commit cbb55c9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -130,6 +130,8 @@ jobs:
           path: /tmp/test_results
         if: failure()
 
+      - run: git stash
+        if: always()
       - name: Publish
         run: c2cciutils-publish
         if: env.HAS_SECRETS == 'HAS_SECRETS'
@@ -141,6 +143,8 @@ jobs:
           path: /tmp/dpkg-versions.patch
           retention-days: 1
         if: failure()
+      - run: git stash pop
+
       - run:
           docker run --rm --env=GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} mapfish_print_builder bash -c 'gradle
           build && gradle publish'