Upgrade p4a #19

Open
jessopb wants to merge 36 commits from upgrade_p4a into master
2 changed files with 3 additions and 3 deletions
Showing only changes of commit d91c0029d3 - Show all commits

View file

@ -17,7 +17,7 @@ jobs:
- name: setup - name: setup
run: | run: |
apt update apt update
apt install libssl-dev -y apt install libssl-dev zip unzip -y
export B_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') export B_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV
echo "BUILD_VERSION=${B_VERSION}" >> $GITHUB_ENV echo "BUILD_VERSION=${B_VERSION}" >> $GITHUB_ENV

View file

@ -531,7 +531,7 @@ main.py that loads it.''')
# else: # else:
# raise e # raise e
def parse_args(args=None): def parse_args_and_make_package(args=None):
global BLACKLIST_PATTERNS, WHITELIST_PATTERNS, PYTHON global BLACKLIST_PATTERNS, WHITELIST_PATTERNS, PYTHON
default_android_api = 21 default_android_api = 21
@ -723,4 +723,4 @@ tools directory of the Android SDK.
if __name__ == "__main__": if __name__ == "__main__":
parse_args() parse_args_and_make_package()