Skip to content

Commit

Permalink
rework
Browse files Browse the repository at this point in the history
  • Loading branch information
nefarius2001 committed Feb 18, 2021
1 parent 408b985 commit b2ac9e5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion autobuild/ensure_THIS_JAMULUS_PROJECT_PATH.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 1 addition & 2 deletions autobuild/linux/autobuild_deb_1_prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions autobuild/mac/artifacts/autobuild_mac_1_prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
6 changes: 0 additions & 6 deletions autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh

This file was deleted.

0 comments on commit b2ac9e5

Please sign in to comment.