Update

qarmin · Oct 6, 2024 · 68a88c2 · 68a88c2
1 parent d1d8e36
commit 68a88c2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/linux_cli.yml b/.github/workflows/linux_cli.yml
@@ -46,6 +46,7 @@ jobs:
           mv target/release/czkawka_cli linux_czkawka_cli
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |

diff --git a/.github/workflows/linux_cli_eyra.yml b/.github/workflows/linux_cli_eyra.yml
@@ -54,6 +54,7 @@ jobs:
           mv target/release/czkawka_cli linux_czkawka_cli_eyra
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |

diff --git a/.github/workflows/linux_gui.yml b/.github/workflows/linux_gui.yml
@@ -34,6 +34,7 @@ jobs:
           mv target/release/krokiet linux_krokiet_gui
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
@@ -68,6 +69,7 @@ jobs:
           mv target/release/krokiet linux_krokiet_heif_raw_gui
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
@@ -112,6 +114,7 @@ jobs:
           mv target/release/czkawka_gui linux_czkawka_gui
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
@@ -127,7 +130,7 @@ jobs:
         run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev librsvg2-dev wget fuse libfuse2 desktop-file-utils -y
 
       - name: Setup rust version
-        run: rustup default stable}
+        run: rustup default stable
 
       - name: Enable LTO
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
@@ -186,6 +189,7 @@ jobs:
           mv out/czkawka_gui-minimal.AppImage linux_czkawka_gui_minimal.AppImage
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -57,6 +57,7 @@ jobs:
           mv target/release/krokiet macos_krokiet
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |

diff --git a/.github/workflows/minimial_version.yml b/.github/workflows/minimial_version.yml
@@ -21,6 +21,6 @@ jobs:
         run: rustup default 1.79.0
 
       - name: Build
-        run:
+        run: |
           cargo build
           cargo build --features "heif,libraw"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -66,6 +66,7 @@ jobs:
 
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
@@ -127,6 +128,7 @@ jobs:
 
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
@@ -194,6 +196,7 @@ jobs:
           mv ./package windows_czkawka_gui_gtk_410.zip
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
@@ -260,6 +263,7 @@ jobs:
           mv ./package windows_czkawka_gui_gtk_46.zip
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
@@ -335,8 +339,10 @@ jobs:
           mv ./package windows_czkawka_gui_gtk_46_console.zip
       - name: Release
         uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
             windows_czkawka_gui_gtk_46_console.zip
           token: ${{ secrets.PAT_REPOSITORY }}
+        if: github.event.pull_request.merged == true && github.event_name == 'pull_request' && github.event.action == 'closed'