From 7cec7abb8a909d5df6c7077c490cf3171819c892 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Fri, 26 Jan 2024 09:07:20 -0500
Subject: [PATCH] update Github actions

---
 .github/workflows/build.yml          | 49 ++++++++++++++--------------
 deploy/generate_ds_store.applescript |  2 +-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 733f953e..6ed45425 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,8 +8,8 @@ on:
   pull_request:
     branches: [ master ]
 env:
-    QtVersion: 6.6.0
-    QtKey: "6.6.0"
+    QtVersion: 6.6.1
+    QtKey: "6.6.1"
     PackageGLOB: "Black_Chocobo-*.*"
     BuildType: Release
     cmakeConfigure: "cmake -S. -Bbuild -DQT_DEFAULT_MAJOR_VERSION=6 -DCMAKE_BUILD_TYPE=Release"
@@ -43,7 +43,7 @@ jobs:
              , debArch: amd64
           }
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - run: git fetch --tags --force
@@ -60,9 +60,9 @@ jobs:
         cmake --build build
         cpack -G DEB -C ${{env.BuildType}} --config build/CPackConfig.cmake
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: debian-artifacts
+        name: debian-artifacts-${{ matrix.config.name }}
         path: blackchocobo*.deb
   main_build:
     name: ${{ matrix.config.name }}
@@ -106,7 +106,7 @@ jobs:
       run: |
         echo "BCVersion=${{ needs.precheck.outputs.version }}" >> $GITHUB_ENV
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - run: git fetch --tags --force
@@ -118,7 +118,7 @@ jobs:
         arch: ${{matrix.config.WIN_ARCH}}
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v3.3.0
       with:
        dir: ${{matrix.config.QT_INST_DIR}}
        version: ${{ env.QtVersion }}
@@ -130,7 +130,7 @@ jobs:
 
     - name: Cache ff7tk
       id: cache-ff7tk
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v4
       with:
         path: ${{ matrix.config.ff7tkPrefix }}
         key: ${{ runner.os }}${{ matrix.config.WIN_ARCH }}-Qt${{env.QtVersion}}-ff7tk-${{ hashFiles( 'ff7tk*') }}
@@ -172,8 +172,9 @@ jobs:
           --plugin=qt
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
+        name: artifact-${{matrix.config.name}}
         path: |
           ${{github.workspace}}/${{env.PackageGLOB}}
           ${{github.workspace}}/blackchocobo[-_]*.*
@@ -197,11 +198,11 @@ jobs:
            , debArch: armhf
           }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: git fetch --tags --force
-      - uses: uraimo/run-on-arch-action@v2.3.0
+      - uses: uraimo/run-on-arch-action@v2.6.0
         name: Build artifact
         with:
           arch: ${{ matrix.config.arch }}
@@ -222,39 +223,39 @@ jobs:
             cmake --build build --config ${{env.BuildType}} --target package
             cpack -G DEB -C ${{env.BuildType}} --config build/CPackConfig.cmake
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: container-artifact
+          name: container-artifact-${{matrix.config.name}}-${{matrix.config.arch}}
           path: |
             build/Black_Chocobo[-_]*.*
             build/blackchocobo[-_]*.*
             blackchocobo*.deb
   release_assets:
     name: Release
-    needs: [main_Build, container_build, deb_builder]
+    needs: [main_build, container_build, deb_builder]
     runs-on: ubuntu-latest
     steps:
     - name: Download Files
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
     - name: Deploy Continuous
-      if: github.ref == 'refs/heads/master'
-      uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
+      if: (github.ref == 'refs/heads/master') && !(contains(github.ref, '/tags/v'))
+      uses: crowbarmaster/GH-Automatic-Releases@latest
       with:
        repo_token: "${{ secrets.DEPLOYTOKEN }}"
        automatic_release_tag: "continuous"
        prerelease: false
        title: "Continuous Build"
        files: |
-         artifact/*
-         container-artifact/*
-         debian-artifacts/*
+         artifact-*/*
+         container-artifact-*/*
+         debian-artifacts-*/*
     - name: Deploy Release
       if: contains(github.ref, 'tags/v')
-      uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
+      uses: crowbarmaster/GH-Automatic-Releases@latest
       with:
        repo_token: "${{ secrets.DEPLOYTOKEN }}"
        prerelease: false
        files: |
-         artifact/*
-         container-artifact/*
-         debian-artifacts/*
+         artifact-*/*
+         container-artifact-*/*
+         debian-artifacts-*/*
diff --git a/deploy/generate_ds_store.applescript b/deploy/generate_ds_store.applescript
index ba043a45..878b57a5 100644
--- a/deploy/generate_ds_store.applescript
+++ b/deploy/generate_ds_store.applescript
@@ -6,7 +6,7 @@ on run argv
 
     -- wait for the image to finish mounting
     set open_attempts to 0
-    repeat while open_attempts < 4
+    repeat while open_attempts < 10
       try
         open
           delay 1