Autobuild: Combine and simplify iOS build scripts #2521
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hoffie
changed the title
22 tasks
ann0see
approved these changes
Mar 19, 2022
pljones
reviewed
Mar 19, 2022
ios/deploy_ios.sh
Outdated
| qmake -spec macx-xcode Jamulus.pro | ||
| /usr/bin/xcodebuild -project Jamulus.xcodeproj -scheme Jamulus -configuration Release clean archive -archivePath "build/Jamulus.xcarchive" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | ||
| # Make a deploy folder | ||
| mkdir deploy | ||
|
|
||
| # Generate ipa by copying the .app file from the xcarchive file |
There was a problem hiding this comment.
xcarchive file looks like a directory.
There was a problem hiding this comment.
I don't know anything about that part, but based on the cp invocation, it must be a directory, so I've adjusted the comment as well (cc @ann0see).
There was a problem hiding this comment.
On macOS it displays as a file although you can cd into it. It’s similar to .app files. They show up as file, but are essentially folders
There was a problem hiding this comment.
A truely broken design...
pljones
reviewed
Mar 19, 2022
ios/deploy_ios.sh
Outdated
| cd deploy | ||
| mkdir build/Payload | ||
| cp -r build/Jamulus.xcarchive/Products/Applications/Jamulus.app build/Payload/ | ||
| cd build || exit 1 |
There was a problem hiding this comment.
set -eu should mean the || exit 1 isn't needed -- it's effectively the same thing, as far as I'm aware.
There was a problem hiding this comment.
Hmm, shellcheck made me do this and I assumed that cd (as a shell built-in) was special compared to other commands which I know are checked with set -e.
I've run a quick test and it looks you are right. I'm going to remove the || exit 1.
This is what happened (probably): I took the script, ran shell check, noted the warning, fixed it and only later noticed that the script did not use set -eu and added that. So, rather PEBKAC than a shellcheck bug... :)
Co-authored-by: Christian Hoffmann <[email protected]>
Related: jamulussoftware#2503 - Move all autobuild/ios/* scripts to a single .github/autobuild/ios.sh script which is called for the different stages (setup/build/get-artifacts). - Condense redundant parameter parsing into a single step - Create functions with proper names for larger steps - Inline Github artifact output definition as it's shorter that way - Make shellcheck-clean
hoffie
force-pushed
the
autobuild-merge-ios-scripts
branch
from
d7cd9f0 to
f460f5c
Compare
hoffie
added a commit
to hoffie/jamulus
that referenced
this pull request
Mar 19, 2022
Now that all platforms have been converted to the new scheme (.github/autobuild/*), the autobuild directory only contains the ensure_THIS_JAMULUS_PROJECT_PATH.sh script which is no longer used. Related: jamulussoftware#2521
hoffie
added a commit
to hoffie/jamulus
that referenced
this pull request
Mar 19, 2022
Now that all platforms have been converted to the new scheme (.github/autobuild/*), the autobuild directory only contains the ensure_THIS_JAMULUS_PROJECT_PATH.sh script which is no longer used. Related: jamulussoftware#2521
5 tasks
hoffie
added a commit
to hoffie/jamulus
that referenced
this pull request
Mar 19, 2022
Now that all platforms have been converted to the new scheme (.github/autobuild/*), the autobuild directory only contains the ensure_THIS_JAMULUS_PROJECT_PATH.sh script which is no longer used. Related: jamulussoftware#2521
hoffie
added a commit
to hoffie/jamulus
that referenced
this pull request
Mar 19, 2022
Now that all platforms have been converted to the new scheme (.github/autobuild/*), the autobuild directory only contains the ensure_THIS_JAMULUS_PROJECT_PATH.sh script which is no longer used. Related: jamulussoftware#2521
hoffie
added a commit
to hoffie/jamulus
that referenced
this pull request
Mar 21, 2022
Now that all platforms have been converted to the new scheme (.github/autobuild/*), the autobuild directory only contains the ensure_THIS_JAMULUS_PROJECT_PATH.sh script which is no longer used. Related: jamulussoftware#2521
ann0see
pushed a commit
to ann0see/jamulus
that referenced
this pull request
Mar 24, 2022
Now that all platforms have been converted to the new scheme (.github/autobuild/*), the autobuild directory only contains the ensure_THIS_JAMULUS_PROJECT_PATH.sh script which is no longer used. Related: jamulussoftware#2521
pgScorpio
pushed a commit
to pgScorpio/jamulus
that referenced
this pull request
Mar 28, 2022
Now that all platforms have been converted to the new scheme (.github/autobuild/*), the autobuild directory only contains the ensure_THIS_JAMULUS_PROJECT_PATH.sh script which is no longer used. Related: jamulussoftware#2521
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Short description of changes
Extract the non-autobuild-related parts into an ios/deploy_ios.sh script, which can run standalone, similar to other platforms (by @ann0see)
Move all autobuild/ios/* scripts to a single .github/autobuild/ios.sh script which is called for the different stages (setup/build/get-artifacts).
Condense redundant parameter parsing into a single step
Create functions with proper names for larger steps
Inline Github artifact output definition as it's shorter that way
Make shellcheck-clean
CHANGELOG: Autobuild: Refactored and simplified iOS build scripts.
(will be condensed...)
Context: Fixes an issue?
Related: #2503
Does this change need documentation? What needs to be documented and how?
Status of this Pull Request
Ready for review.
What is missing until this pull request can be merged?
Reviews.
Checklist