diff --git a/.github/convert_tag_date.py b/.github/convert_tag_date.py index fe6bdaf..9a8e23c 100644 --- a/.github/convert_tag_date.py +++ b/.github/convert_tag_date.py @@ -1,18 +1,18 @@ import argparse import re +import sys from datetime import datetime -parser = argparse.ArgumentParser("convert_tag_date") -parser.add_argument("tag", help="Release tag", type=str) -args = parser.parse_args() +def get_date_from_tag(tag): + # A format of the tag is r+yyyyMMdd, we + # strip out any non digit symbols here. + date_str = re.match(r'[^\d]*(\d+).*', tag).group(1) + date = datetime.strptime(date_str, '%Y%m%d') + return "{:%Y%m%d}".format(date) -tag = args.tag -# A format of the tag is r+yyyyMMdd, we -# strip out any non digit symbols here. -date_str = re.match(r'[^\d]*(\d+).*', tag).group(1) -date = datetime.strptime(date_str, '%Y%m%d') - -# Release date. -out = "{:%Y%m%d}".format(date) -print(out) +if __name__ == "__main__": + parser = argparse.ArgumentParser("convert_tag_date") + parser.add_argument("tag", help="Release tag", type=str) + args = parser.parse_args() + print(get_date_from_tag(args.tag)) diff --git a/.github/setup_gradle_properties_release.py b/.github/setup_gradle_properties_release.py new file mode 100644 index 0000000..0c7787b --- /dev/null +++ b/.github/setup_gradle_properties_release.py @@ -0,0 +1,23 @@ +import argparse +import re +import subprocess + +from datetime import datetime +from convert_tag_date import get_date_from_tag + +parser = argparse.ArgumentParser("setup_gradle_properties") +parser.add_argument("tag", help="Release tag", type=str) +args = parser.parse_args() + +tag = args.tag +date = get_date_from_tag(tag) +ref = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('utf-8').strip() + +text = f""" +versionDate={date} +versionRef={ref} +buildkonfig.flavor=release +""" + +with open("gradle.properties", "a") as f: + f.write(text) diff --git a/.github/workflows/new_daily_tag_play_store_internal_track.yaml b/.github/workflows/new_daily_tag_play_store_internal_track.yaml index 4e38bb8..f306f5a 100644 --- a/.github/workflows/new_daily_tag_play_store_internal_track.yaml +++ b/.github/workflows/new_daily_tag_play_store_internal_track.yaml @@ -22,10 +22,7 @@ jobs: echo ${{ secrets.KEYSTORE_PROPS_B64 }} | base64 -d | zcat >> androidApp/keyguard-release.properties echo ${{ secrets.GOOGLE_SERVICES }} | base64 -d | zcat >> androidApp/google-services.json echo ${{ secrets.SERVICE_ACCOUNT_B64 }} | base64 -d | zcat >> service-account-google.json - echo "" >> gradle.properties - echo "versionDate=$(python .github/convert_tag_date.py tag=${{ github.ref_name }})" >> gradle.properties - echo "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties - echo buildkonfig.flavor=release >> gradle.properties + python .github/setup_gradle_properties_release.py tag=${{ github.ref_name }} - name: "Check and Build licenses" uses: gradle/actions/setup-gradle@v3 env: diff --git a/.github/workflows/new_tag_release.yaml b/.github/workflows/new_tag_release.yaml index 7bde6df..476e006 100644 --- a/.github/workflows/new_tag_release.yaml +++ b/.github/workflows/new_tag_release.yaml @@ -32,10 +32,7 @@ jobs: p12-password: ${{ secrets.CERT_PASSWD }} - name: "Setup build env" run: | - echo "" >> gradle.properties - echo "versionDate=$(python .github/convert_tag_date.py tag=${{ github.ref_name }})" >> gradle.properties - echo "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties - echo buildkonfig.flavor=release >> gradle.properties + python .github/setup_gradle_properties_release.py tag=${{ github.ref_name }} - name: "Setup signing config" run: | echo "" >> gradle.properties @@ -84,6 +81,10 @@ jobs: with: lfs: true submodules: recursive + - name: "Set up Python" + uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: "Set up JDK 17" id: setup-java uses: actions/setup-java@v4 @@ -92,10 +93,7 @@ jobs: java-version: '17' - name: "Setup build env" run: | - echo "" >> gradle.properties - echo "versionDate=$(python .github/convert_tag_date.py tag=${{ github.ref_name }})" >> gradle.properties - echo "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties - echo buildkonfig.flavor=release >> gradle.properties + python .github/setup_gradle_properties_release.py tag=${{ github.ref_name }} - name: "./gradlew :desktopApp:bundleFlatpak" uses: gradle/actions/setup-gradle@v3 env: @@ -128,10 +126,7 @@ jobs: 17 - name: "Setup build env" run: | - echo "" >> gradle.properties - echo "versionDate=$(python .github/convert_tag_date.py tag=${{ github.ref_name }})" >> gradle.properties - echo "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties - echo buildkonfig.flavor=release >> gradle.properties + python .github/setup_gradle_properties_release.py tag=${{ github.ref_name }} - name: "./gradlew :desktopApp:packageMsi" uses: gradle/actions/setup-gradle@v3 env: @@ -161,10 +156,7 @@ jobs: echo ${{ secrets.KEYSTORE_B64 }} | base64 -d | zcat >> androidApp/keyguard-release.keystore echo ${{ secrets.KEYSTORE_PROPS_B64 }} | base64 -d | zcat >> androidApp/keyguard-release.properties echo ${{ secrets.GOOGLE_SERVICES }} | base64 -d | zcat >> androidApp/google-services.json - echo "" >> gradle.properties - echo "versionDate=$(python .github/convert_tag_date.py tag=${{ github.ref_name }})" >> gradle.properties - echo "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties - echo buildkonfig.flavor=release >> gradle.properties + python .github/setup_gradle_properties_release.py tag=${{ github.ref_name }} - name: "Check and Build licenses" uses: gradle/actions/setup-gradle@v3 env: