Skip to content

Instantly share code, notes, and snippets.

@torarnv

torarnv/stdin.patch

Created April 29, 2024 09:20
Show Gist options
  • Save torarnv/42ee5cd47a6605c6f46b872ce691bd65 to your computer and use it in GitHub Desktop.
Save torarnv/42ee5cd47a6605c6f46b872ce691bd65 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
stdin.patch
diff --git 1/qtci-macos-13-x86_64/01-sha1sum-compatibility.sh 2/qtci-macos-14-x86_64/01-sha1sum-compatibility.sh
index 583195c7..e31fe48b 100755
--- 1/qtci-macos-13-x86_64/01-sha1sum-compatibility.sh
+++ 2/qtci-macos-14-x86_64/01-sha1sum-compatibility.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#!/usr/bin/env bash
diff --git 1/qtci-macos-13-x86_64/05-systemsetup.sh 2/qtci-macos-14-x86_64/05-systemsetup.sh
index 5a1e3fbf..d7f07955 100755
--- 1/qtci-macos-13-x86_64/05-systemsetup.sh
+++ 2/qtci-macos-14-x86_64/05-systemsetup.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
set -ex
@@ -9,7 +9,9 @@ set -ex
targetFile="$HOME/vncpw.txt"
# Fetch password
-curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.ci.qt.io/input/semisecure/vncpw.txt" -o "$targetFile"
+curl --retry 5 --retry-delay 10 --retry-max-time 60 \
+ "http://ci-files01-hki.ci.qt.io/input/semisecure/vncpw.txt" \
+ -o "$targetFile"
shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0"
{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null
@@ -59,7 +61,9 @@ defaults write -g KeyRepeat -int 2
set +x
echo "Enable remote desktop sharing"
-sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw "$VNCPassword" -restart -agent -privs -all
+sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart \
+ -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts \
+ -setvncpw -vncpw "$VNCPassword" -restart -agent -privs -all
set -x
echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
diff --git 1/qtci-macos-13-x86_64/15-xz.sh 2/qtci-macos-14-x86_64/15-xz.sh
index 57cc1f5c..9abb7f53 100755
--- 1/qtci-macos-13-x86_64/15-xz.sh
+++ 2/qtci-macos-14-x86_64/15-xz.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# This script installs XZ-Utils
diff --git 1/qtci-macos-13-x86_64/20-xcode.sh 2/qtci-macos-14-x86_64/20-xcode.sh
index 75c7ddc9..62d78e72 100755
--- 1/qtci-macos-13-x86_64/20-xcode.sh
+++ 2/qtci-macos-14-x86_64/20-xcode.sh
@@ -19,4 +19,4 @@ set -ex
# shellcheck source=../common/macos/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
-InstallXCode /net/ci-files01-hki.ci.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2
+InstallXCode /net/ci-files01-hki.ci.qt.io/hdd/www/input/mac/Xcode_15.3.xip 15.3
diff --git 1/qtci-macos-13-x86_64/21-install-commandlinetools.sh 2/qtci-macos-14-x86_64/21-install-commandlinetools.sh
index 3e71b5c9..7d1708bd 100755
--- 1/qtci-macos-13-x86_64/21-install-commandlinetools.sh
+++ 2/qtci-macos-14-x86_64/21-install-commandlinetools.sh
@@ -6,9 +6,9 @@ set -ex
# shellcheck source=../common/macos/install-commandlinetools.sh
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="14.2"
+version="15.3"
packageName="Command_Line_Tools_for_Xcode_$version.dmg"
url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
-sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6"
+sha1="e7149414aff0e3d6c85245683e77ddde2f410ec0"
InstallCommandLineTools $url $url $sha1 $packageName $version
diff --git 1/qtci-macos-13-x86_64/25-homebrew.sh 2/qtci-macos-14-x86_64/25-homebrew.sh
index 237dc507..7ff457b7 100755
--- 1/qtci-macos-13-x86_64/25-homebrew.sh
+++ 2/qtci-macos-14-x86_64/25-homebrew.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# Will install homebrew package manager for macOS.
@@ -10,11 +10,10 @@ set -e
. "$(dirname "$0")"/../common/unix/DownloadURL.sh
-
DownloadURL \
- http://ci-files01-hki.ci.qt.io/input/mac/homebrew/a822f0d0f1838c07e86b356fcd2bf93c7a11c2aa/install.sh \
- https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \
- 3210da71e12a699ab3bba43910a6d5fc64b92000 \
+ http://ci-files01-hki.ci.qt.io/input/mac/homebrew/d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522/install.sh \
+ http://ci-files01-hki.ci.qt.io/input/mac/homebrew/d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522/install.sh \
+ d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522 \
/tmp/homebrew_install.sh
DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw"
@@ -25,4 +24,3 @@ rm -f "/Users/qt/pw"
# No need to manually do `brew update`, the homebrew installer script does it.
### brew update
-
diff --git 1/qtci-macos-13-x86_64/25-mysql.sh 2/qtci-macos-14-x86_64/25-mysql.sh
index f5717d0b..b9f0c0ae 100755
--- 1/qtci-macos-13-x86_64/25-mysql.sh
+++ 2/qtci-macos-14-x86_64/25-mysql.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# This script installs MySQL
diff --git 1/qtci-macos-13-x86_64/35-install_protobuf.sh 2/qtci-macos-14-x86_64/35-install_protobuf.sh
index c538ca07..b0761374 100755
--- 1/qtci-macos-13-x86_64/35-install_protobuf.sh
+++ 2/qtci-macos-14-x86_64/35-install_protobuf.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
set -ex
diff --git 1/qtci-macos-13-x86_64/36-install_grpc.sh 2/qtci-macos-13-x86_64/36-install_grpc.sh
deleted file mode 100755
index ecd6a51f..00000000
--- 1/qtci-macos-13-x86_64/36-install_grpc.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -ex
-
-# shellcheck source=../common/unix/install_grpc.sh
-source "${BASH_SOURCE%/*}/../common/unix/install_grpc.sh"
-
diff --git 1/qtci-macos-13-x86_64/50-openssl_for_android_darwin.sh 2/qtci-macos-14-x86_64/50-openssl_for_android_darwin.sh
index c3e51d23..8cb78e85 100755
--- 1/qtci-macos-13-x86_64/50-openssl_for_android_darwin.sh
+++ 2/qtci-macos-14-x86_64/50-openssl_for_android_darwin.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
set -ex
diff --git 1/qtci-macos-13-x86_64/90-install-ffmpeg.sh 2/qtci-macos-14-x86_64/90-install-ffmpeg.sh
index dfdc1022..23cb13e1 100755
--- 1/qtci-macos-13-x86_64/90-install-ffmpeg.sh
+++ 2/qtci-macos-14-x86_64/90-install-ffmpeg.sh
@@ -5,5 +5,3 @@
set -ex
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git 1/qtci-macos-13-x86_64/97-set-locale.sh 2/qtci-macos-14-x86_64/97-set-locale.sh
index bc966cbf..4ac0fd13 100755
--- 1/qtci-macos-13-x86_64/97-set-locale.sh
+++ 2/qtci-macos-14-x86_64/97-set-locale.sh
@@ -5,4 +5,4 @@
set -ex
BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/set-locale.sh"
+"$BASEDIR"/../common/macos/set-locale.sh
diff --git 1/qtci-macos-13-x86_64/99-mac-version.sh 2/qtci-macos-14-x86_64/99-mac-version.sh
index b9b5aeb0..d145d1e9 100755
--- 1/qtci-macos-13-x86_64/99-mac-version.sh
+++ 2/qtci-macos-14-x86_64/99-mac-version.sh
@@ -5,4 +5,4 @@
set -ex
BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/macos-version.sh"
+"$BASEDIR"/../common/macos/macos-version.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment