diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml index 961ba34..a1b7263 100644 --- a/.github/workflows/build-apk.yml +++ b/.github/workflows/build-apk.yml @@ -137,7 +137,7 @@ jobs: - name: Upload Build Artifact uses: ncipollo/release-action@main with: - artifacts: "*-output.apk" + artifacts: "*-output.apk,updates.json,changelog.json,changelog.md" token: ${{ secrets.GITHUB_TOKEN }} tag: Build-${{ steps.get-date.outputs.date }} artifactErrorsFailBuild: true diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index 6c11636..04bcf39 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -118,6 +118,9 @@ jobs: with: name: Built-APKs path: | + changelog.md + changelog.json + updates.json apks/*-output.apk apks/VancedMicroG.apk" if-no-files-found: error diff --git a/src/app.py b/src/app.py index d3f94a4..8383a9e 100644 --- a/src/app.py +++ b/src/app.py @@ -80,8 +80,8 @@ class APP(object): a string that represents the output file name for an APK file. """ current_date = datetime.now(timezone(time_zone)) - formatted_date = current_date.strftime("%Y%b%d_%I%M%p").upper() - return f"Re-{self.app_name}-app-version{slugify(self.app_version)}-{formatted_date}-patch-version-{slugify(self.resource["patches"]["version"])}output.apk" + formatted_date = current_date.strftime("%Y%b%d.%I%M%p").upper() + return f"Re{self.app_name}-Version{slugify(self.app_version)}-PatchVersion{slugify(self.resource["patches"]["version"])}-{formatted_date}-output.apk" # noqa: E501 def __str__(self: "APP") -> str: """Returns the str representation of the app.""" diff --git a/src/utils.py b/src/utils.py index 2f9a886..d86101c 100644 --- a/src/utils.py +++ b/src/utils.py @@ -173,16 +173,16 @@ def slugify(string: str) -> str: modified_string = string.lower() # Remove special characters - modified_string = re.sub(r"[^\w\s-]", "-", modified_string) + modified_string = re.sub(r"[^\w\s-]", ".", modified_string) # Replace spaces with dashes - modified_string = re.sub(r"\s+", "-", modified_string) + modified_string = re.sub(r"\s+", ".", modified_string) # Remove consecutive dashes - modified_string = re.sub(r"-+", "-", modified_string) + modified_string = re.sub(r"-+", ".", modified_string) # Remove leading and trailing dashes - return modified_string.strip("-") + return modified_string.strip(".") def _check_version(output: str) -> None: