An update

LukeeGD · Nov 30, 2024 · 21990ed · 21990ed
1 parent 1a5317c
commit 21990ed
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
   pull_request:
   workflow_dispatch:
   schedule:
@@ -39,29 +40,29 @@ jobs:
         ${{ github.workspace }}/.github/workflows/mac-post.sh
     - name: Versioning
       id: Versioning
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Versioning
         path: |
           ${{ github.workspace }}/latest_build_sha.txt
           ${{ github.workspace }}/latest_build_num.txt
     - name: macOS RELEASE Archive
       id: macOS-RELEASE-Archive
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: futurerestore-macOS-RELEASE
         path: |
           ${{ github.workspace }}/futurerestore-macOS-*-RELEASE.tar.xz
     - name: macOS DEBUG Archive
       id: macOS-DEBUG-Archive
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: futurerestore-macOS-DEBUG
         path: |
           ${{ github.workspace }}/futurerestore-macOS-*-DEBUG.tar.xz
     - name: macOS ASAN Archive
       id: macOS-ASAN-Archive
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: futurerestore-macOS-ASAN
         path: |
@@ -101,21 +102,21 @@ jobs:
           mv ${{ github.workspace }}/.github/workflows/futurerestore3.tar.xz ${{ github.workspace }}/.github/workflows/$(cat ${{ github.workspace }}/.github/workflows/name3.txt)
       - name: futurerestore Linux x86_64 RELEASE Archive
         id: futurerestore-Linux-x86_64-RELEASE-Archive
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: futurerestore-Linux-x86_64-RELEASE
           path: |
             ${{ github.workspace }}/.github/workflows/futurerestore-Linux-x86_64*-RELEASE.tar.xz
       - name: futurerestore Linux x86_64 DEBUG Archive
         id: futurerestore-Linux-x86_64-DEBUG-Archive
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: futurerestore-Linux-x86_64-DEBUG
           path: |
             ${{ github.workspace }}/.github/workflows/futurerestore-Linux-x86_64*-DEBUG.tar.xz
       - name: futurerestore Linux x86_64 ASAN Archive
         id: futurerestore-Linux-x86_64-ASAN-Archive
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: futurerestore-Linux-x86_64-ASAN
           path: |

diff --git a/.github/workflows/linux-bootstrap.sh b/.github/workflows/linux-bootstrap.sh
@@ -24,14 +24,14 @@ ln -sf /usr/bin/ld.lld-15 /usr/bin/ld
 ln -sf /usr/bin/clang-15 /usr/bin/clang
 ln -sf /usr/bin/clang++-15 /usr/bin/clang++
 curl -sO https://cdn.cryptiiiic.com/bootstrap/linux_fix.tar.zst &
-curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_Release_Latest.tar.zst &
-curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_Debug_Latest.tar.zst &
+curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_1720751343_Release.tar.zst &
+curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_1720751343_Debug.tar.zst &
 curl -sLO https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2-linux-x86_64.tar.gz &
 wait
 rm -rf ${DEP_ROOT}/{lib,include} || true
 mkdir -p ${DEP_ROOT}/Linux_x86_64_{Release,Debug}
-tar xf Linux_x86_64_Release_Latest.tar.zst -C ${DEP_ROOT}/Linux_x86_64_Release &
-tar xf Linux_x86_64_Debug_Latest.tar.zst -C ${DEP_ROOT}/Linux_x86_64_Debug &
+tar xf Linux_x86_64_1720751343_Release.tar.zst -C ${DEP_ROOT}/Linux_x86_64_Release &
+tar xf Linux_x86_64_1720751343_Debug.tar.zst -C ${DEP_ROOT}/Linux_x86_64_Debug &
 tar xf linux_fix.tar.zst -C ${TMPDIR}/Builder &
 tar xf cmake-3.23.2-linux-x86_64.tar.gz
 cp -RpP cmake-3.23.2-linux-x86_64/* /usr/local/ || true

diff --git a/.github/workflows/mac-bootstrap.sh b/.github/workflows/mac-bootstrap.sh
@@ -7,10 +7,10 @@ export BASE=/Users/runner/work/futurerestore/futurerestore/
 
 cd ${WORKFLOW_ROOT}
 curl -sO https://cdn.cryptiiiic.com/bootstrap/bootstrap_x86_64.tar.zst &
-curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/x86_64/macOS_x86_64_Release_Latest.tar.zst &
-curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/arm64/macOS_arm64_Release_Latest.tar.zst &
-curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/x86_64/macOS_x86_64_Debug_Latest.tar.zst &
-curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/arm64/macOS_arm64_Debug_Latest.tar.zst &
+curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/x86_64/macOS_x86_64_1300_1720751343_Release.tar.zst &
+curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/arm64/macOS_arm64_1700_1720751343_Release.tar.zst &
+curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/x86_64/macOS_x86_64_1300_1720751343_Debug.tar.zst &
+curl -sO https://cdn.cryptiiiic.com/deps/static/macOS/arm64/macOS_arm64_1700_1720751343_Debug.tar.zst &
 wait
 sudo gtar xf ${WORKFLOW_ROOT}/bootstrap_x86_64.tar.zst -C / --warning=none || true || true &
 echo "${PROCURSUS}/bin" | sudo tee /etc/paths1
@@ -20,10 +20,10 @@ sudo mv /etc/paths{1,}
 wait
 rm -rf ${DEP_ROOT}/{lib,include} || true
 mkdir -p ${DEP_ROOT}/macOS_x86_64_Release ${DEP_ROOT}/macOS_x86_64_Debug ${DEP_ROOT}/macOS_arm64_Release ${DEP_ROOT}/macOS_arm64_Debug
-gtar xf macOS_x86_64_Release_Latest.tar.zst -C ${DEP_ROOT}/macOS_x86_64_Release &
-gtar xf macOS_x86_64_Debug_Latest.tar.zst -C ${DEP_ROOT}/macOS_x86_64_Debug &
-gtar xf macOS_arm64_Release_Latest.tar.zst -C ${DEP_ROOT}/macOS_arm64_Release &
-gtar xf macOS_arm64_Debug_Latest.tar.zst -C ${DEP_ROOT}/macOS_arm64_Debug &
+gtar xf macOS_x86_64_1300_1720751343_Release.tar.zst -C ${DEP_ROOT}/macOS_x86_64_Release &
+gtar xf macOS_x86_64_1300_1720751343_Debug.tar.zst -C ${DEP_ROOT}/macOS_x86_64_Debug &
+gtar xf macOS_arm64_1700_1720751343_Release.tar.zst -C ${DEP_ROOT}/macOS_arm64_Release &
+gtar xf macOS_arm64_1700_1720751343_Debug.tar.zst -C ${DEP_ROOT}/macOS_arm64_Debug &
 wait
 sudo mv /usr/local/bin{,1}
 cd ${BASE}

diff --git a/src/futurerestore.cpp b/src/futurerestore.cpp
@@ -203,11 +203,6 @@ futurerestore::futurerestore(bool isUpdateInstall, bool isPwnDfu, bool noIBSS, b
     if (stat(futurerestoreTempPath.c_str(), &st) == -1) safe_mkdir(futurerestoreTempPath.c_str(), 0755);
 #endif
 
-// TODO: implement windows CI and enable update check
-#ifndef WIN32
-    this->checkForUpdates();
-#endif
-
     nocache = 1; //tsschecker nocache
     _foundnonce = -1;
     _useCustomLatest = false;
@@ -1551,8 +1546,8 @@ void futurerestore::doRestore(const char *ipsw) {
                   "Device did not disconnect. Possibly invalid iBEC. If you're using a USB-C to Lightning cable, switch to USB-A to Lightning (see issue #67)");
 #else
         retassure((client->mode == MODE_UNKNOWN || (mutex_unlock(&client->device_event_mutex), 0)),
-                  "Device did not disconnect. Possibly invalid iBEC. Reset device and try again");  
-#endif  
+                  "Device did not disconnect. Possibly invalid iBEC. Reset device and try again");
+#endif
         mutex_unlock(&client->device_event_mutex);
 
         debug("Waiting for device to reconnect...\n");
@@ -1563,8 +1558,8 @@ void futurerestore::doRestore(const char *ipsw) {
                   "Device did not disconnect. Possibly invalid iBEC. If you're using a USB-C to Lightning cable, switch to USB-A to Lightning (see issue #67)");
 #else
         retassure((client->mode == MODE_RECOVERY || (mutex_unlock(&client->device_event_mutex), 0)),
-                  "Device did not disconnect. Possibly invalid iBEC. Reset device and try again");    
-#endif    
+                  "Device did not disconnect. Possibly invalid iBEC. Reset device and try again");
+#endif
         mutex_unlock(&client->device_event_mutex);
     }