Skip to content

Commit

Permalink
remove qtci installer code (GPSBabel#1289)
Browse files Browse the repository at this point in the history
* remove qtci which hasn't been used for a long time.

* remove another obsolete qtci file.

* remove another qtci reference.

* delete obsolete travis build code.

* rename osx install script

* catch ci up with osx travis install script renames.

* remove obsolete debug code from qtio installer.
  • Loading branch information
tsteven4 authored Jul 1, 2024
1 parent c0b5787 commit 563410f
Show file tree
Hide file tree
Showing 16 changed files with 7 additions and 1,179 deletions.
1 change: 0 additions & 1 deletion .codacy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ exclude_paths:
- "reference/**"
- "shapelib/**"
- "strptime/**"
- "tools/qtci/README.md"
- "tools/uploadtool/README.md"
- "zlib/**"
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
- name: Qt install
if: steps.cache.outputs.cache-hit != 'true'
env:
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CI_BUILD_DIR: ${{ github.workspace }}
run: |
./tools/travis_install_osx ${{ matrix.QT_VERSION }} aqt
./tools/ci_install_osx.sh ${{ matrix.QT_VERSION }} aqt
- name: Brew install
if: matrix.GENERATOR == 'Ninja'
Expand Down
116 changes: 0 additions & 116 deletions tools/Dockerfile_qtio

This file was deleted.

20 changes: 3 additions & 17 deletions tools/travis_install_osx → tools/ci_install_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ function version_ge() { test "$(printf "%s\n%s" "$1" "$2" | sort -rV | head -n 1
function debug() {
cat "${CACHEDIR}/qt-${QT_VERSION}.env"
find "${CACHEDIR}" -maxdepth 3 -ls
cat "${CACHEDIR}/Qt/InstallationLog.txt"
cat "${CACHEDIR}/Qt/components.xml"
echo "$1" >&2
exit 1
}
Expand Down Expand Up @@ -47,16 +45,6 @@ fi

if [ -d "${QTDIR}/bin" ]; then
echo "Using cached Qt."
echo "If you need to clear the cache see"
echo "https://docs.travis-ci.com/user/caching/#Fetching-and-storing-caches."
if [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
# the cache is being used. modify it to reset expiration date.
date > "${CACHEDIR}/timestamp"
fi
if [ -f "${CACHEDIR}/timestamp" ]; then
echo -n "Cache timestamp: "
cat "${CACHEDIR}/timestamp"
fi
else
rm -fr "${CACHEDIR}"
mkdir -p "${CACHEDIR}"
Expand Down Expand Up @@ -85,13 +73,11 @@ else
)
elif [ "$METHOD" = "aqt" ]; then
pip3 install aqtinstall>=2.0.0
"${TRAVIS_BUILD_DIR}/tools/ci_install_qt.sh" mac "${QT_VERSION}" clang_64 "${CACHEDIR}/Qt"
"${CI_BUILD_DIR}/tools/ci_install_qt.sh" mac "${QT_VERSION}" clang_64 "${CACHEDIR}/Qt"
echo "export PATH=${QTDIR}/bin:\$PATH" > "${CACHEDIR}/qt-${QT_VERSION}.env"
else
# install-qt creates the install at $PWD/Qt.
QT_VERSION_SHORT=${QT_VERSION//./}
QT_CI_PACKAGES=qt.qt5.${QT_VERSION_SHORT}.clang_64,qt.qt5.${QT_VERSION_SHORT}.qtwebengine QT_CI_DOWNLOADER="wget -nv -c" PATH=${TRAVIS_BUILD_DIR}/tools/qtci:${PATH} install-qt "${QT_VERSION}"
rm "${CACHEDIR}"/qt-opensource*.dmg
echo "ERROR: unknown installation method ${METHOD}." >&2
exit 1
fi
popd
validate
Expand Down
16 changes: 2 additions & 14 deletions tools/ci_install_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,8 @@ else
"${CI_BUILD_DIR}/tools/ci_install_qt.sh" windows "${QT_VERSION}" "${PACKAGE_SUFFIX}" "${CACHEDIR}/Qt"
echo "export PATH=${QTDIR}/bin:\$PATH" > "${CACHEDIR}/qt.env"
else
QT_VERSION_SHORT=${QT_VERSION//./}
QT_VERSION_MAJMIN=${QT_VERSION%.*}
curl -s -L -o "qt-opensource-windows-x86-${QT_VERSION}.exe" "https://download.qt.io/official_releases/qt/${QT_VERSION_MAJMIN}/${QT_VERSION}/qt-opensource-windows-x86-${QT_VERSION}.exe"
ls -l ./*.exe
netsh advfirewall firewall add rule name=dummyupqt dir=out action=block program="$(cygpath -w "${PWD}/qt-opensource-windows-x86-${QT_VERSION}.exe")"
"${PWD}/qt-opensource-windows-x86-${QT_VERSION}.exe" --verbose --script "${CI_BUILD_DIR}/tools/qtci/qt-install.qs" QTCI_OUTPUT="${CACHEDIR}/Qt" QTCI_PACKAGES="qt.qt5.${QT_VERSION_SHORT}.${PACKAGE_SUFFIX},qt.qt5.${QT_VERSION_SHORT}.qtwebengine"
netsh advfirewall firewall delete rule name=dummyupqt
rm "qt-opensource-windows-x86-${QT_VERSION}.exe"
ls "${CACHEDIR}/Qt"
rm -fr "${CACHEDIR}/Qt/Docs"
rm -fr "${CACHEDIR}/Qt/Examples"
rm -fr "${CACHEDIR}/Qt/Tools"
rm -f "${CACHEDIR}/Qt/MaintenanceTool.*"
echo "export PATH=${QTDIR}/bin:\$PATH" > "${CACHEDIR}/qt.env"
echo "ERROR: unknown installation method ${METHOD}." >&2
exit 1
fi
fi
validate
39 changes: 0 additions & 39 deletions tools/make_docker_qtio_image

This file was deleted.

Loading

0 comments on commit 563410f

Please sign in to comment.