From 639be7149f3daa27a7a6c54cb8b12ea747eeb8a6 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Wed, 12 Feb 2020 09:47:52 -0800
Subject: GitHub Actions/iOS: shift to using a pre-packaged Qt installation

Since the official Qt binaries can no longer be installed without disclosing
credentials (well, sure, that could be done through secrets), I decided that
we should go back to packaging just the part of the iOS Qt SDK that we need.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .github/workflows/ios.yml                    | 19 ++-------
 packaging/ios/qt-installer-noninteractive.qs | 60 ----------------------------
 2 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 packaging/ios/qt-installer-noninteractive.qs

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index f70334b71..013371af0 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -18,29 +18,16 @@ jobs:
     - name: set our Qt build
       run: |
         env
-        curl -L --output qt-opensource-mac-x64-5.13.1.dmg https://download.qt.io/archive/qt/5.13/5.13.1/qt-opensource-mac-x64-5.13.1.dmg
-        df -h
-        mkdir -p mnt
-        sudo hdiutil attach -mountroot $PWD/mnt -noverify -noautoopen -verbose qt-opensource-mac-x64-5.13.1.dmg
-        df -h
-        ls -l mnt
-        find mnt
-        ./mnt/qt-opensource-mac-x64-5.13.1/qt-opensource-mac-x64-5.13.1.app/Contents/MacOS/qt-opensource-mac-x64-5.13.1 --platform minimal --script packaging/ios/qt-installer-noninteractive.qs --no-force-installations
-        df -h
+        curl -L --output Qt-5.14.1-ios.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/Qt-5.14.1-ios.tar.xz
+        mkdir -p $HOME/Qt
+        xzcat Qt-5.14.1-ios.tar.xz | tar -x -C $HOME/Qt -f -
     - name: build Subsurface-mobile for iOS
       run: |
-        ls -l $HOME $HOME/Qt
         cd packaging/ios
         ln -s $HOME/Qt Qt
-        pushd Qt
-        ls -l
-        popd
         echo "build dependencies"
         bash -x build.sh -simulator
         echo "Subsurface-mobile for iOS"
         cd build-Subsurface-mobile-*for_iOS-Release
         sed -i.bak 's/-Wall/-Wno-everything/' Makefile # make the build far less verbose
         make -j2
-
-
-        
diff --git a/packaging/ios/qt-installer-noninteractive.qs b/packaging/ios/qt-installer-noninteractive.qs
deleted file mode 100644
index 5b1faa5ba..000000000
--- a/packaging/ios/qt-installer-noninteractive.qs
+++ /dev/null
@@ -1,60 +0,0 @@
-// http://stackoverflow.com/a/34032216/78204
-
-function Controller() {
-    installer.autoRejectMessageBoxes();
-    installer.setMessageBoxAutomaticAnswer("OverwriteTargetDirectory", QMessageBox.Yes);
-    installer.installationFinished.connect(function() {
-        gui.clickButton(buttons.NextButton);
-    })
-}
-
-Controller.prototype.WelcomePageCallback = function() {
-    gui.clickButton(buttons.NextButton,3000);
-}
-
-Controller.prototype.CredentialsPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.IntroductionPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.TargetDirectoryPageCallback = function()
-{
-    gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("HomeDir") + "/Qt");
-    //gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("InstallerDirPath") + "/Qt");
-    //gui.currentPageWidget().TargetDirectoryLineEdit.setText("/scratch/Qt");
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ComponentSelectionPageCallback = function() {
-    var widget = gui.currentPageWidget();
-
-    widget.deselectAll();
-    widget.selectComponent('qt.qt5.5131.ios');
-
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.LicenseAgreementPageCallback = function() {
-    gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.StartMenuDirectoryPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ReadyForInstallationPageCallback = function()
-{
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.FinishedPageCallback = function() {
-var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm
-if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
-    checkBoxForm.launchQtCreatorCheckBox.checked = false;
-}
-    gui.clickButton(buttons.FinishButton);
-}
-- 
cgit v1.2.3-70-g09d2