diff --git a/.github/convert_tag_date.py b/.github/convert_tag_date.py new file mode 100644 index 0000000..99ba803 --- /dev/null +++ b/.github/convert_tag_date.py @@ -0,0 +1,18 @@ +import argparse +import re + +from datetime import datetime + +parser = argparse.ArgumentParser("convert_tag_date") +parser.add_argument("tag", help="Release tag", type=str) +args = parser.parse_args() + +tag = args.tag +# A format of the tag is r+yyyyMMdd, we +# strip out any non digit symbols here. +date_str = re.sub(r'[^\d]', '', tag) +date = datetime.strptime(date_str, '%Y%m%d') + +# Release date. +out = "{:%Y%m%d}".format(date) +print(out) diff --git a/.github/convert_tag_release_name.py b/.github/convert_tag_release_name.py new file mode 100644 index 0000000..12ecc3f --- /dev/null +++ b/.github/convert_tag_release_name.py @@ -0,0 +1,18 @@ +import argparse +import re + +from datetime import datetime + +parser = argparse.ArgumentParser("convert_tag_release_name") +parser.add_argument("tag", help="Release tag", type=str) +args = parser.parse_args() + +tag = args.tag +# A format of the tag is r+yyyyMMdd, we +# strip out any non digit symbols here. +date_str = re.sub(r'[^\d]', '', tag) +date = datetime.strptime(date_str, '%Y%m%d') + +# Release date name. +out = "{:%Y.%m.%d}".format(date) +print(out) 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 0e68bea..4e38bb8 100644 --- a/.github/workflows/new_daily_tag_play_store_internal_track.yaml +++ b/.github/workflows/new_daily_tag_play_store_internal_track.yaml @@ -16,9 +16,6 @@ jobs: with: distribution: 'temurin' java-version: '17' - - id: vars - run: | - echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT - name: "Prepare env" run: | echo ${{ secrets.KEYSTORE_B64 }} | base64 -d | zcat >> androidApp/keyguard-release.keystore @@ -26,7 +23,7 @@ jobs: 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=${{ steps.vars.outputs.tag }} >> 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 - name: "Check and Build licenses" diff --git a/.github/workflows/new_tag_release.yaml b/.github/workflows/new_tag_release.yaml index ca2dbf1..7bde6df 100644 --- a/.github/workflows/new_tag_release.yaml +++ b/.github/workflows/new_tag_release.yaml @@ -30,13 +30,10 @@ jobs: with: p12-filepath: desktopApp/macos-dev.cer p12-password: ${{ secrets.CERT_PASSWD }} - - id: vars - run: | - echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT - name: "Setup build env" run: | echo "" >> gradle.properties - echo versionDate=${{ steps.vars.outputs.tag }} >> 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 - name: "Setup signing config" @@ -93,13 +90,10 @@ jobs: with: distribution: 'temurin' java-version: '17' - - id: vars - run: | - echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT - name: "Setup build env" run: | echo "" >> gradle.properties - echo versionDate=${{ steps.vars.outputs.tag }} >> 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 - name: "./gradlew :desktopApp:bundleFlatpak" @@ -132,12 +126,10 @@ jobs: java-version: | 11 17 - - id: vars - run: | - echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT - 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 - name: "./gradlew :desktopApp:packageMsi" @@ -164,15 +156,13 @@ jobs: with: distribution: 'temurin' java-version: '17' - - id: vars - run: | - echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT - name: "Prepare env" run: | 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 - name: "Check and Build licenses" @@ -239,12 +229,13 @@ jobs: path: artifacts - id: vars run: | - echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT + date=$(python .github/convert_tag_release_name.py tag=${{ github.ref_name }}) + echo "date=$date" >> $GITHUB_OUTPUT - name: "Create release" uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/') with: - name: Release ${{ steps.vars.outputs.tag }} + name: Release ${{ steps.vars.outputs.date }} body: ${{ steps.changelog.outputs.changelog }} token: ${{ secrets.GITHUB_TOKEN }} files: |