Skip to content

Autobuild: Reorganize macOS/iOS build scripts #2476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoffie merged 3 commits into from
Mar 12, 2022
Merged

Autobuild: Reorganize macOS/iOS build scripts #2476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6941711
Autobuild: Merge Mac build scripts
hoffie Mar 9, 2022
20f9b12
Autobuild: Move ios build scripts up one level
hoffie Mar 9, 2022
729bbd8
Autobuild: Drop extra Mac codeQL step
hoffie Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions .github/workflows/autobuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,40 +102,31 @@ jobs:
cmd3_postbuild: "./autobuild/linux/autobuild_deb_3_copy_files.sh"
run_codeql: true

- config_name: MacOS (codeQL)
- config_name: MacOS (artifacts+codeQL)
target_os: macos
# Stay on 10.15 as long as we use dmgbuild which does not work with 11's hdiutil (?):
building_on_os: macos-10.15
cmd1_prebuild: "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh 5.15.2"
cmd2_build: "./autobuild/mac/codeQL/autobuild_mac_2_build.sh"
cmd3_postbuild: false
cmd1_prebuild: "./autobuild/mac/autobuild_mac_1_prepare.sh 5.15.2"
cmd2_build: "./autobuild/mac/autobuild_mac_2_build.sh sign_if_possible"
cmd3_postbuild: "./autobuild/mac/autobuild_mac_3_copy_files.sh"
run_codeql: true
xcode_version: 12.1.1

- config_name: MacOS (artifacts)
target_os: macos
# Stay on 10.15 as long as we use dmgbuild which does not work with 11's hdiutil (?)
building_on_os: macos-10.15
cmd1_prebuild: "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.15.2"
cmd2_build: "./autobuild/mac/artifacts/autobuild_mac_2_build.sh sign_if_possible"
cmd3_postbuild: "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh"
run_codeql: false
xcode_version: 12.1.1

- config_name: iOS (artifacts)
target_os: ios
building_on_os: macos-10.15
cmd1_prebuild: "./autobuild/ios/artifacts/autobuild_ios_1_prepare.sh 5.15.2"
cmd2_build: "./autobuild/ios/artifacts/autobuild_ios_2_build.sh"
cmd3_postbuild: "./autobuild/ios/artifacts/autobuild_ios_3_copy_files.sh"
cmd1_prebuild: "./autobuild/ios/autobuild_ios_1_prepare.sh 5.15.2"
cmd2_build: "./autobuild/ios/autobuild_ios_2_build.sh"
cmd3_postbuild: "./autobuild/ios/autobuild_ios_3_copy_files.sh"
run_codeql: false
xcode_version: 12.1.1

- config_name: MacOS Legacy (artifacts)
target_os: macos
building_on_os: macos-10.15
cmd1_prebuild: "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.9.9"
cmd2_build: "./autobuild/mac/artifacts/autobuild_mac_2_build.sh do_not_sign"
cmd3_postbuild: "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh legacy"
cmd1_prebuild: "./autobuild/mac/autobuild_mac_1_prepare.sh 5.9.9"
cmd2_build: "./autobuild/mac/autobuild_mac_2_build.sh do_not_sign"
cmd3_postbuild: "./autobuild/mac/autobuild_mac_3_copy_files.sh legacy"
run_codeql: false
# For Qt5 on Mac, we need to ensure SDK 10.15 is used, and not SDK 11.x.
# Xcode 12.1 is the most-recent release which still ships SDK 10.15:
Expand Down Expand Up @@ -182,7 +173,7 @@ jobs:
/usr/local/opt/qt
~/Library/Caches/pip
~/Library/Cache/jamulus-homebrew-bottles
key: ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/mac/artifacts/autobuild_mac_1_prepare.sh', 'autobuild/mac/codeQL/autobuild_mac_1_prepare.sh', 'mac/deploy_mac.sh') }}-${{ matrix.config.cmd1_prebuild }}
key: ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/mac/autobuild_mac_1_prepare.sh', 'mac/deploy_mac.sh') }}-${{ matrix.config.cmd1_prebuild }}

- name: Cache Windows dependencies
if: matrix.config.target_os == 'windows'
Expand Down
0 .../ios/artifacts/autobuild_ios_1_prepare.sh → autobuild/ios/autobuild_ios_1_prepare.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ld/ios/artifacts/autobuild_ios_2_build.sh → autobuild/ios/autobuild_ios_2_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
####################


source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"

###################
### PROCEDURE ###
Expand Down
2 changes: 1 addition & 1 deletion ...s/artifacts/autobuild_ios_3_copy_files.sh → autobuild/ios/autobuild_ios_3_copy_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi
### PARAMETERS ###
####################

source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"

###################
### PROCEDURE ###
Expand Down
0 .../mac/artifacts/autobuild_mac_1_prepare.sh → autobuild/mac/autobuild_mac_1_prepare.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ld/mac/artifacts/autobuild_mac_2_build.sh → autobuild/mac/autobuild_mac_2_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [ -n "${SIGN}" ]; then
shift
fi

source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"

###################
### PROCEDURE ###
Expand Down
2 changes: 1 addition & 1 deletion ...c/artifacts/autobuild_mac_3_copy_files.sh → autobuild/mac/autobuild_mac_3_copy_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi
### PARAMETERS ###
####################

source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"

###################
### PROCEDURE ###
Expand Down
35 changes: 0 additions & 35 deletions autobuild/mac/codeQL/autobuild_mac_1_prepare.sh
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions autobuild/mac/codeQL/autobuild_mac_2_build.sh
View file
Open in desktop

This file was deleted.