RIP gdrive [deploy]

Sigil-Ebook · Jul 19, 2023 · 5157b51 · 5157b51
1 parent 61688bb
commit 5157b51
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 43 deletions.
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
@@ -26,33 +26,30 @@ on:
     - '.retired_travis.yml'
     - '**/**.md'
 env:
-  GDRIVE_REFRESH_TOKEN: ${{ secrets.GDRIVE_REFRESH_TOKEN }}
-  GDRIVE_DIR: ${{ secrets.SIGIL_MAC_GDRIVE_DIR }}
   HOMEBREW_NO_AUTO_UPDATE: 1
   HOMEBREW_NO_INSTALL_CLEANUP: 1
   MACOSX_DEPLOYMENT_TARGET: 10.12
-  DOWNLOADQT: https://github.com/kevinhendricks/BuildSigilOnMac/releases/download/for_sigil_1.0.0/Qt5129.tar.xz
+  DOWNLOADQT: https://github.com/kevinhendricks/BuildSigilOnMac/releases/download/for_sigil_1.0.0/Qt5159.tar.xz
   DOWNLOADPY: https://github.com/kevinhendricks/BuildSigilOnMac/releases/download/for_sigil_1.0.0/Python.framework.tar.xz
-  DOWNLOADGDRIVE: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/gdrive-darwin-amd64
-  PY_VER: 3.9
-  QT: Qt5129
+  PY_VER: 3.11
+  QT: Qt5159
 
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Cache Custom Qt
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{runner.workspace}}/${{env.QT}}
         key: ${{ runner.os }}-qtdeps-${{hashFiles('**/reset-mac-caches.txt')}}
 
     - name: Cache Custom Python
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{runner.workspace}}/Frameworks
         key: ${{ runner.os }}-qtdeps-${{hashFiles('**/reset-mac-caches.txt')}}
@@ -61,7 +58,6 @@ jobs:
       shell: bash
       working-directory: ${{runner.workspace}}
       run: |
-        brew install wget
         pwd
         if [[ ! -d ${{runner.workspace}}/${{env.QT}} ]]; \
         then wget ${DOWNLOADQT} && tar xzf ${{env.QT}}.tar.xz; fi
@@ -78,10 +74,6 @@ jobs:
         then mkdir Frameworks && cd ${{runner.workspace}}/Frameworks && \
         wget ${DOWNLOADPY} && tar xzf Python.framework.tar.xz; fi
 
-        curl -L -o gdrive ${DOWNLOADGDRIVE}
-        chmod a+x ./gdrive
-        echo ${{runner.workspace}} >> $GITHUB_PATH
-
         export MYDEST=${{runner.workspace}}/Frameworks
         echo ${MYDEST}/Python.framework/Versions/${PY_VER}/bin >> $GITHUB_PATH
         echo "Qt5_DIR=${{runner.workspace}}/${{env.QT}}/lib/cmake/Qt5" >> $GITHUB_ENV
@@ -101,7 +93,7 @@ jobs:
       shell: bash
       run: |
         cmake -DPKG_SYSTEM_PYTHON=1 \
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_CXX_FLAGS=-Wno-inconsistent-missing-override \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/${{env.QT}}/lib/cmake \
@@ -119,18 +111,19 @@ jobs:
         cd ./bin
         tar -cJf Sigil.tar.xz Sigil.app
 
-    - name: Upload to gdrive
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      if: "contains(github.event.head_commit.message, '[deploy]') && github.event_name != 'pull_request'"
-      run: |
-        gdrive version
-        python3 $GITHUB_WORKSPACE/ci_scripts/newgddeploy.py
+    # RIP gdrive
+    #- name: Upload to gdrive
+    #  working-directory: ${{runner.workspace}}/build
+    #  shell: bash
+    #  if: "contains(github.event.head_commit.message, '[deploy]') && github.event_name != 'pull_request'"
+    #  run: |
+    #    gdrive version
+    #    python3 $GITHUB_WORKSPACE/ci_scripts/newgddeploy.py
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: "contains(github.event.head_commit.message, '[deploy]')"
       with:
         name: sigil-installer
         path: ${{runner.workspace}}/build/bin/Sigil.tar.xz
-        retention-days: 3
+        retention-days: 5
 
diff --git a/.github/workflows/reset-mac-caches.txt b/.github/workflows/reset-mac-caches.txt
@@ -1,3 +1,4 @@
 Change the content of this file to reset the caches for the github actions sigil mac build
 
 cleared cache on 27 December 2021
+cleared cache on 19 July 2023
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
@@ -30,9 +30,6 @@ on:
 env:
   BUILD_TYPE: Release
   DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt5.15.9_x64_VS2022.7z
-  GDRIVE: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/gdrive-windows-x64.exe
-  GDRIVE_REFRESH_TOKEN: ${{ secrets.GDRIVE_REFRESH_TOKEN }}
-  GDRIVE_DIR: ${{ secrets.SIGIL_WIN_GDRIVE_DIR }}
   QT: Qt5.15.9
   INNO: C:\Program Files (x86)\Inno Setup 6
   CMAKE64BIT: -DWIN_INSTALLER_USE_64BIT_CRT=1
@@ -65,17 +62,11 @@ jobs:
 
     - uses: lukka/get-cmake@latest
 
-    #- name: Cache pip modules
-    #  uses: actions/cache@v3
-    #  with:
-    #    path: C:\hostedtoolcache\windows\Python\3.8.6\x64\lib\site-packages
-    #    key: ${{ runner.os }}-pipdeps-${{hashFiles('**/reset-win-caches.txt')}}
-
     - name: Install pip dependencies
       shell: cmd
       run: |
         set PATH=C:\%PYTHON%;C:\%PYTHON%\Scripts;%PATH%
-        python -m pip install pip==21.0.1
+        python -m pip install --upgrade pip
         pip install six==1.16.0
         pip install html5lib==1.1
         pip install regex==2023.3.23
@@ -97,8 +88,6 @@ jobs:
         echo ${{runner.workspace}}
         mkdir ${{runner.workspace}}\build
         cd ${{runner.workspace}}\build
-        curl.exe -L -o gdrive.exe "%GDRIVE%"
-        gdrive.exe version
         qmake -v
         python --version
 
@@ -133,13 +122,14 @@ jobs:
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
         ninja -j2 makeinstaller
 
-    - name: Upload to gdrive
-      shell: cmd
-      working-directory: ${{runner.workspace}}\build
-      if: "contains(github.event.head_commit.message, '[deploy]') && github.event_name != 'pull_request'"
-      run: |
-        set PATH=C:\%PYTHON%;${{runner.workspace}}\build;%PATH%
-        python %GITHUB_WORKSPACE%\ci_scripts\newgddeploy.py
+    # RIP gdrive
+    #- name: Upload to gdrive
+    #  shell: cmd
+    #  working-directory: ${{runner.workspace}}\build
+    #  if: "contains(github.event.head_commit.message, '[deploy]') && github.event_name != 'pull_request'"
+    #  run: |
+    #    set PATH=C:\%PYTHON%;${{runner.workspace}}\build;%PATH%
+    #    python %GITHUB_WORKSPACE%\ci_scripts\newgddeploy.py
 
     - uses: actions/upload-artifact@v3
       if: "contains(github.event.head_commit.message, '[deploy]')"