From 7af739f993156d6672b5c7cf26c54f79335a102c Mon Sep 17 00:00:00 2001 From: nefarius2001 Date: Tue, 16 Feb 2021 01:51:27 +0100 Subject: [PATCH] move autobuild folders --- .github/workflows/autobuild.yml | 36 +++++++++---------- .../archive___android_build_docker/Dockerfile | 0 .../__example__jamulusbuild.sh | 0 .../archive___android_build_docker/action.yml | 0 .../build_qt_project.sh | 0 .../install-qt.sh | 0 .../android}/autobuild_apk_1_prepare.sh | 0 .../android}/autobuild_apk_2_build.sh | 0 .../android}/autobuild_apk_3_copy_files.sh | 0 .../android}/install-qt.sh | 0 .../artifacts/autobuild_deb_1_prepare.sh | 0 .../linux}/artifacts/autobuild_deb_2_build.sh | 0 .../artifacts/autobuild_deb_3_copy_files.sh | 0 .../linux}/codeQL/auto_1_prepare.sh | 0 .../linux}/codeQL/auto_2_build_qt_project.sh | 0 .../linux}/codeQL/auto_3_copy_files.sh | 0 .../mac}/artifacts/autobuild_mac_1_prepare.sh | 0 .../mac}/artifacts/autobuild_mac_2_build.sh | 0 .../artifacts/autobuild_mac_3_copy_files.sh | 0 .../mac}/codeQL/autobuild_mac_1_prepare.sh | 0 .../mac}/codeQL/autobuild_mac_2_build.sh | 0 .../mac}/codeQL/autobuild_mac_3_copy_files.sh | 0 .../autobuild_windowsinstaller_1_prepare.ps1 | 0 .../autobuild_windowsinstaller_2_build.ps1 | 0 ...utobuild_windowsinstaller_3_copy_files.ps1 | 0 25 files changed, 18 insertions(+), 18 deletions(-) rename {android/autobuild => autobuild/android}/archive___android_build_docker/Dockerfile (100%) rename {android/autobuild => autobuild/android}/archive___android_build_docker/__example__jamulusbuild.sh (100%) rename {android/autobuild => autobuild/android}/archive___android_build_docker/action.yml (100%) rename {android/autobuild => autobuild/android}/archive___android_build_docker/build_qt_project.sh (100%) rename {android/autobuild => autobuild/android}/archive___android_build_docker/install-qt.sh (100%) rename {android/autobuild => autobuild/android}/autobuild_apk_1_prepare.sh (100%) rename {android/autobuild => autobuild/android}/autobuild_apk_2_build.sh (100%) rename {android/autobuild => autobuild/android}/autobuild_apk_3_copy_files.sh (100%) rename {android/autobuild => autobuild/android}/install-qt.sh (100%) rename {linux/autobuild => autobuild/linux}/artifacts/autobuild_deb_1_prepare.sh (100%) rename {linux/autobuild => autobuild/linux}/artifacts/autobuild_deb_2_build.sh (100%) rename {linux/autobuild => autobuild/linux}/artifacts/autobuild_deb_3_copy_files.sh (100%) rename {linux/autobuild => autobuild/linux}/codeQL/auto_1_prepare.sh (100%) rename {linux/autobuild => autobuild/linux}/codeQL/auto_2_build_qt_project.sh (100%) rename {linux/autobuild => autobuild/linux}/codeQL/auto_3_copy_files.sh (100%) rename {mac/autobuild => autobuild/mac}/artifacts/autobuild_mac_1_prepare.sh (100%) rename {mac/autobuild => autobuild/mac}/artifacts/autobuild_mac_2_build.sh (100%) rename {mac/autobuild => autobuild/mac}/artifacts/autobuild_mac_3_copy_files.sh (100%) rename {mac/autobuild => autobuild/mac}/codeQL/autobuild_mac_1_prepare.sh (100%) rename {mac/autobuild => autobuild/mac}/codeQL/autobuild_mac_2_build.sh (100%) rename {mac/autobuild => autobuild/mac}/codeQL/autobuild_mac_3_copy_files.sh (100%) rename {windows/autobuild => autobuild/windows}/autobuild_windowsinstaller_1_prepare.ps1 (100%) rename {windows/autobuild => autobuild/windows}/autobuild_windowsinstaller_2_build.ps1 (100%) rename {windows/autobuild => autobuild/windows}/autobuild_windowsinstaller_3_copy_files.ps1 (100%) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 808621dd1f..cf2536e611 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -99,49 +99,49 @@ jobs: - config_name: AndroidAPK (artifact+codeql) target_os: android building_on_os: ubuntu-20.04 - cmd1_prebuild: "sh android/autobuild/autobuild_apk_1_prepare.sh " - cmd2_build: "sh android/autobuild/autobuild_apk_2_build.sh " - cmd3_postbuild: "sh android/autobuild/autobuild_apk_3_copy_files.sh " + cmd1_prebuild: "sh autobuild/android/autobuild_apk_1_prepare.sh " + cmd2_build: "sh autobuild/android/autobuild_apk_2_build.sh " + cmd3_postbuild: "sh autobuild/android/autobuild_apk_3_copy_files.sh " uses_codeql: true - config_name: Linux (codeQL) target_os: linux building_on_os: ubuntu-20.04 - cmd1_prebuild: "sh linux/autobuild/codeQL/auto_1_prepare.sh ${{ needs.create_release.outputs.x_github_workspace }}" - cmd2_build: "sh linux/autobuild/codeQL/auto_2_build_qt_project.sh" - cmd3_postbuild: "sh linux/autobuild/codeQL/auto_3_copy_files.sh" + cmd1_prebuild: "sh autobuild/linux/codeQL/auto_1_prepare.sh ${{ needs.create_release.outputs.x_github_workspace }}" + cmd2_build: "sh autobuild/linux/codeQL/auto_2_build_qt_project.sh" + cmd3_postbuild: "sh autobuild/linux/codeQL/auto_3_copy_files.sh" uses_codeql: true - config_name: Linux (artifacts) target_os: linux building_on_os: ubuntu-20.04 - cmd1_prebuild: "sh linux/autobuild/artifacts/autobuild_deb_1_prepare.sh" - cmd2_build: "sh linux/autobuild/artifacts/autobuild_deb_2_build.sh" - cmd3_postbuild: "sh linux/autobuild/artifacts/autobuild_deb_3_copy_files.sh" + cmd1_prebuild: "sh autobuild/linux/artifacts/autobuild_deb_1_prepare.sh" + cmd2_build: "sh autobuild/linux/artifacts/autobuild_deb_2_build.sh" + cmd3_postbuild: "sh autobuild/linux/artifacts/autobuild_deb_3_copy_files.sh" uses_codeql: false - config_name: MacOS (codeQL) target_os: macos building_on_os: macos-10.15 - cmd1_prebuild: "sh mac/autobuild/codeQL/autobuild_mac_1_prepare.sh" - cmd2_build: "sh mac/autobuild/codeQL/autobuild_mac_2_build.sh" - cmd3_postbuild: "sh mac/autobuild/codeQL/autobuild_mac_3_copy_files.sh" + cmd1_prebuild: "sh autobuild/mac/codeQL/autobuild_mac_1_prepare.sh" + cmd2_build: "sh autobuild/mac/codeQL/autobuild_mac_2_build.sh" + cmd3_postbuild: "sh autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh" uses_codeql: true - config_name: MacOS (artifacts) target_os: macos building_on_os: macos-10.15 - cmd1_prebuild: "sh mac/autobuild/artifacts/autobuild_mac_1_prepare.sh" - cmd2_build: "sh mac/autobuild/artifacts/autobuild_mac_2_build.sh" - cmd3_postbuild: "sh mac/autobuild/artifacts/autobuild_mac_3_copy_files.sh" + cmd1_prebuild: "sh autobuild/mac/artifacts/autobuild_mac_1_prepare.sh" + cmd2_build: "sh autobuild/mac/artifacts/autobuild_mac_2_build.sh" + cmd3_postbuild: "sh autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh" uses_codeql: false - config_name: Windows (artifact+codeql) target_os: windows building_on_os: windows-latest - cmd1_prebuild: powershell .\windows\autobuild\autobuild_windowsinstaller_1_prepare.ps1 - cmd2_build: powershell .\windows\autobuild\autobuild_windowsinstaller_2_build.ps1 - cmd3_postbuild: powershell .\windows\autobuild\autobuild_windowsinstaller_3_copy_files.ps1 + cmd1_prebuild: powershell .\autobuild\windows\autobuild_windowsinstaller_1_prepare.ps1 + cmd2_build: powershell .\autobuild\windows\autobuild_windowsinstaller_2_build.ps1 + cmd3_postbuild: powershell .\autobuild\windows\autobuild_windowsinstaller_3_copy_files.ps1 uses_codeql: true runs-on: ${{ matrix.config.building_on_os }} diff --git a/android/autobuild/archive___android_build_docker/Dockerfile b/autobuild/android/archive___android_build_docker/Dockerfile similarity index 100% rename from android/autobuild/archive___android_build_docker/Dockerfile rename to autobuild/android/archive___android_build_docker/Dockerfile diff --git a/android/autobuild/archive___android_build_docker/__example__jamulusbuild.sh b/autobuild/android/archive___android_build_docker/__example__jamulusbuild.sh similarity index 100% rename from android/autobuild/archive___android_build_docker/__example__jamulusbuild.sh rename to autobuild/android/archive___android_build_docker/__example__jamulusbuild.sh diff --git a/android/autobuild/archive___android_build_docker/action.yml b/autobuild/android/archive___android_build_docker/action.yml similarity index 100% rename from android/autobuild/archive___android_build_docker/action.yml rename to autobuild/android/archive___android_build_docker/action.yml diff --git a/android/autobuild/archive___android_build_docker/build_qt_project.sh b/autobuild/android/archive___android_build_docker/build_qt_project.sh similarity index 100% rename from android/autobuild/archive___android_build_docker/build_qt_project.sh rename to autobuild/android/archive___android_build_docker/build_qt_project.sh diff --git a/android/autobuild/archive___android_build_docker/install-qt.sh b/autobuild/android/archive___android_build_docker/install-qt.sh similarity index 100% rename from android/autobuild/archive___android_build_docker/install-qt.sh rename to autobuild/android/archive___android_build_docker/install-qt.sh diff --git a/android/autobuild/autobuild_apk_1_prepare.sh b/autobuild/android/autobuild_apk_1_prepare.sh similarity index 100% rename from android/autobuild/autobuild_apk_1_prepare.sh rename to autobuild/android/autobuild_apk_1_prepare.sh diff --git a/android/autobuild/autobuild_apk_2_build.sh b/autobuild/android/autobuild_apk_2_build.sh similarity index 100% rename from android/autobuild/autobuild_apk_2_build.sh rename to autobuild/android/autobuild_apk_2_build.sh diff --git a/android/autobuild/autobuild_apk_3_copy_files.sh b/autobuild/android/autobuild_apk_3_copy_files.sh similarity index 100% rename from android/autobuild/autobuild_apk_3_copy_files.sh rename to autobuild/android/autobuild_apk_3_copy_files.sh diff --git a/android/autobuild/install-qt.sh b/autobuild/android/install-qt.sh similarity index 100% rename from android/autobuild/install-qt.sh rename to autobuild/android/install-qt.sh diff --git a/linux/autobuild/artifacts/autobuild_deb_1_prepare.sh b/autobuild/linux/artifacts/autobuild_deb_1_prepare.sh similarity index 100% rename from linux/autobuild/artifacts/autobuild_deb_1_prepare.sh rename to autobuild/linux/artifacts/autobuild_deb_1_prepare.sh diff --git a/linux/autobuild/artifacts/autobuild_deb_2_build.sh b/autobuild/linux/artifacts/autobuild_deb_2_build.sh similarity index 100% rename from linux/autobuild/artifacts/autobuild_deb_2_build.sh rename to autobuild/linux/artifacts/autobuild_deb_2_build.sh diff --git a/linux/autobuild/artifacts/autobuild_deb_3_copy_files.sh b/autobuild/linux/artifacts/autobuild_deb_3_copy_files.sh similarity index 100% rename from linux/autobuild/artifacts/autobuild_deb_3_copy_files.sh rename to autobuild/linux/artifacts/autobuild_deb_3_copy_files.sh diff --git a/linux/autobuild/codeQL/auto_1_prepare.sh b/autobuild/linux/codeQL/auto_1_prepare.sh similarity index 100% rename from linux/autobuild/codeQL/auto_1_prepare.sh rename to autobuild/linux/codeQL/auto_1_prepare.sh diff --git a/linux/autobuild/codeQL/auto_2_build_qt_project.sh b/autobuild/linux/codeQL/auto_2_build_qt_project.sh similarity index 100% rename from linux/autobuild/codeQL/auto_2_build_qt_project.sh rename to autobuild/linux/codeQL/auto_2_build_qt_project.sh diff --git a/linux/autobuild/codeQL/auto_3_copy_files.sh b/autobuild/linux/codeQL/auto_3_copy_files.sh similarity index 100% rename from linux/autobuild/codeQL/auto_3_copy_files.sh rename to autobuild/linux/codeQL/auto_3_copy_files.sh diff --git a/mac/autobuild/artifacts/autobuild_mac_1_prepare.sh b/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh similarity index 100% rename from mac/autobuild/artifacts/autobuild_mac_1_prepare.sh rename to autobuild/mac/artifacts/autobuild_mac_1_prepare.sh diff --git a/mac/autobuild/artifacts/autobuild_mac_2_build.sh b/autobuild/mac/artifacts/autobuild_mac_2_build.sh similarity index 100% rename from mac/autobuild/artifacts/autobuild_mac_2_build.sh rename to autobuild/mac/artifacts/autobuild_mac_2_build.sh diff --git a/mac/autobuild/artifacts/autobuild_mac_3_copy_files.sh b/autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh similarity index 100% rename from mac/autobuild/artifacts/autobuild_mac_3_copy_files.sh rename to autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh diff --git a/mac/autobuild/codeQL/autobuild_mac_1_prepare.sh b/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh similarity index 100% rename from mac/autobuild/codeQL/autobuild_mac_1_prepare.sh rename to autobuild/mac/codeQL/autobuild_mac_1_prepare.sh diff --git a/mac/autobuild/codeQL/autobuild_mac_2_build.sh b/autobuild/mac/codeQL/autobuild_mac_2_build.sh similarity index 100% rename from mac/autobuild/codeQL/autobuild_mac_2_build.sh rename to autobuild/mac/codeQL/autobuild_mac_2_build.sh diff --git a/mac/autobuild/codeQL/autobuild_mac_3_copy_files.sh b/autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh similarity index 100% rename from mac/autobuild/codeQL/autobuild_mac_3_copy_files.sh rename to autobuild/mac/codeQL/autobuild_mac_3_copy_files.sh diff --git a/windows/autobuild/autobuild_windowsinstaller_1_prepare.ps1 b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 similarity index 100% rename from windows/autobuild/autobuild_windowsinstaller_1_prepare.ps1 rename to autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 diff --git a/windows/autobuild/autobuild_windowsinstaller_2_build.ps1 b/autobuild/windows/autobuild_windowsinstaller_2_build.ps1 similarity index 100% rename from windows/autobuild/autobuild_windowsinstaller_2_build.ps1 rename to autobuild/windows/autobuild_windowsinstaller_2_build.ps1 diff --git a/windows/autobuild/autobuild_windowsinstaller_3_copy_files.ps1 b/autobuild/windows/autobuild_windowsinstaller_3_copy_files.ps1 similarity index 100% rename from windows/autobuild/autobuild_windowsinstaller_3_copy_files.ps1 rename to autobuild/windows/autobuild_windowsinstaller_3_copy_files.ps1