diff --git a/.drone.yml b/.drone.yml index d31e2c10..0ee0a2e0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -93,16 +93,16 @@ steps: GOOGLE_KEYSTORE_PASS: from_secret: GOOGLE_KEYSTORE_PASS - - name: Build Intermediate Android Release Artifact (Bundle) - commands: - - ./ci.py --build-bundle - environment: - STANDALONE_KEYSTORE_PASS: - from_secret: STANDALONE_KEYSTORE_PASS - FDROID_KEYSTORE_PASS: - from_secret: FDROID_KEYSTORE_PASS - GOOGLE_KEYSTORE_PASS: - from_secret: GOOGLE_KEYSTORE_PASS +# - name: Build Intermediate Android Release Artifact (Bundle) +# commands: +# - ./ci.py --build-bundle +# environment: +# STANDALONE_KEYSTORE_PASS: +# from_secret: STANDALONE_KEYSTORE_PASS +# FDROID_KEYSTORE_PASS: +# from_secret: FDROID_KEYSTORE_PASS +# GOOGLE_KEYSTORE_PASS: +# from_secret: GOOGLE_KEYSTORE_PASS - name: Sign Android Release Artifact (.APK) for Standalone Use commands: diff --git a/ci.py b/ci.py index 5fe92aed..77f167cd 100755 --- a/ci.py +++ b/ci.py @@ -52,7 +52,7 @@ def gitea_create_release(): url = f"{GITEA_HOST_URL}/api/v1/repos/{GITEA_REPO_FULL}/releases" token = os.environ.get("GITEA_RELEASE_TOKEN") params = {"access_token": f"{token}"} - json = {"tag_name": f"{APP_SEMVER}", "name": f"{APP_SEMVER}", "prerelease": True} + json = {"tag_name": f"{os.environ.get('DRONE_SEMVER') or APP_SEMVER}", "name": f"{os.environ.get('DRONE_SEMVER' or APP_SEMVER)}", "prerelease": True} request = requests.post(url, params=params, json=json)