From b2ac9e5da6e7bfecc469cc05b203468068a5f2dc Mon Sep 17 00:00:00 2001 From: nefarius2001 Date: Thu, 18 Feb 2021 21:02:03 +0100 Subject: [PATCH] rework --- .github/workflows/autobuild.yml | 10 +++++----- autobuild/ensure_THIS_JAMULUS_PROJECT_PATH.sh | 2 +- autobuild/linux/autobuild_deb_1_prepare.sh | 3 +-- autobuild/mac/artifacts/autobuild_mac_1_prepare.sh | 5 +---- autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh | 6 ------ 5 files changed, 8 insertions(+), 18 deletions(-) delete mode 100755 autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index c8182fa9e6..508dfd6be1 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -95,15 +95,15 @@ jobs: - config_name: AndroidAPK (artifact+codeQL) target_os: android building_on_os: ubuntu-20.04 - cmd1_prebuild: "sh ./autobuild/android/autobuild_apk_1_prepare.sh " - cmd2_build: "./autobuild/android/autobuild_apk_2_build.sh " - cmd3_postbuild: "./autobuild/android/autobuild_apk_3_copy_files.sh " + cmd1_prebuild: "sh ./autobuild/android/autobuild_apk_1_prepare.sh" # this step needs sh instead of bash for permissions + cmd2_build: "./autobuild/android/autobuild_apk_2_build.sh" + cmd3_postbuild: "./autobuild/android/autobuild_apk_3_copy_files.sh" uses_codeql: true - config_name: Linux (artifacts+codeQL) target_os: linux building_on_os: ubuntu-20.04 - cmd1_prebuild: "sh ./autobuild/linux/autobuild_deb_1_prepare.sh" + cmd1_prebuild: "sh ./autobuild/linux/autobuild_deb_1_prepare.sh" # this step needs sh instead of bash for permissions cmd2_build: "./autobuild/linux/autobuild_deb_2_build.sh" cmd3_postbuild: "./autobuild/linux/autobuild_deb_3_copy_files.sh" uses_codeql: true @@ -113,7 +113,7 @@ jobs: building_on_os: macos-10.15 cmd1_prebuild: "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh" cmd2_build: "./autobuild/mac/codeQL/autobuild_mac_2_build.sh" - cmd3_postbuild: "./autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh" + cmd3_postbuild: false uses_codeql: true - config_name: MacOS (artifacts) diff --git a/autobuild/ensure_THIS_JAMULUS_PROJECT_PATH.sh b/autobuild/ensure_THIS_JAMULUS_PROJECT_PATH.sh index f366dcd05b..45f707e17b 100755 --- a/autobuild/ensure_THIS_JAMULUS_PROJECT_PATH.sh +++ b/autobuild/ensure_THIS_JAMULUS_PROJECT_PATH.sh @@ -27,7 +27,7 @@ if [ -d "$THIS_JAMULUS_PROJECT_PATH" ]; then #python -c "import os; print(os.path.abspath(\"${THIS_JAMULUS_PROJECT_PATH}\"));" echo "THIS_JAMULUS_PROJECT_PATH exists (absolute): ${THIS_JAMULUS_PROJECT_PATH}" else - echo "ERROR: non-existing THIS_JAMULUS_PROJECT_PATH: ${THIS_JAMULUS_PROJECT_PATH}" + echo "ERROR: THIS_JAMULUS_PROJECT_PATH must reference an existing directory: \"${THIS_JAMULUS_PROJECT_PATH}\"" exit 1 fi diff --git a/autobuild/linux/autobuild_deb_1_prepare.sh b/autobuild/linux/autobuild_deb_1_prepare.sh index fa8f53fe24..ab215813b8 100755 --- a/autobuild/linux/autobuild_deb_1_prepare.sh +++ b/autobuild/linux/autobuild_deb_1_prepare.sh @@ -11,7 +11,6 @@ echo "Update system..." sudo apt-get -qq update -# We don't upgrade the packages. If this is needed, just uncomment this line -# sudo apt-get -qq -y upgrade + echo "Install dependencies..." sudo apt-get -qq -y install devscripts build-essential debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools diff --git a/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh b/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh index 7d22d4cc62..fd489a344f 100755 --- a/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh +++ b/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh @@ -7,13 +7,10 @@ ################### echo "Install dependencies..." -#brew install qt5 -#brew link qt5 --force python3 -m pip install aqtinstall - python3 -m aqt install --outputdir /usr/local/opt/qt 5.9.9 mac desktop -# add the qt binaries to the path +# add the qt binaries to the path export -p PATH=/usr/local/opt/qt/5.9.9/clang_64/bin:"${PATH}" echo "::set-env name=PATH::${PATH}" echo "the path is ${PATH}" diff --git a/autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh b/autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh deleted file mode 100755 index 1da36e7b90..0000000000 --- a/autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# autobuild_3_copy_files: copy the built files to deploy folder - - -echo "there are no artifacts in this run for CodeQL" \ No newline at end of file