fix: Correctly parse release tag as date #332
This commit is contained in:
parent
d31471de17
commit
fa4aa722b1
18
.github/convert_tag_date.py
vendored
Normal file
18
.github/convert_tag_date.py
vendored
Normal file
@ -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)
|
18
.github/convert_tag_release_name.py
vendored
Normal file
18
.github/convert_tag_release_name.py
vendored
Normal file
@ -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)
|
@ -16,9 +16,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
- id: vars
|
|
||||||
run: |
|
|
||||||
echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT
|
|
||||||
- name: "Prepare env"
|
- name: "Prepare env"
|
||||||
run: |
|
run: |
|
||||||
echo ${{ secrets.KEYSTORE_B64 }} | base64 -d | zcat >> androidApp/keyguard-release.keystore
|
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.GOOGLE_SERVICES }} | base64 -d | zcat >> androidApp/google-services.json
|
||||||
echo ${{ secrets.SERVICE_ACCOUNT_B64 }} | base64 -d | zcat >> service-account-google.json
|
echo ${{ secrets.SERVICE_ACCOUNT_B64 }} | base64 -d | zcat >> service-account-google.json
|
||||||
echo "" >> gradle.properties
|
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 "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties
|
||||||
echo buildkonfig.flavor=release >> gradle.properties
|
echo buildkonfig.flavor=release >> gradle.properties
|
||||||
- name: "Check and Build licenses"
|
- name: "Check and Build licenses"
|
||||||
|
23
.github/workflows/new_tag_release.yaml
vendored
23
.github/workflows/new_tag_release.yaml
vendored
@ -30,13 +30,10 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
p12-filepath: desktopApp/macos-dev.cer
|
p12-filepath: desktopApp/macos-dev.cer
|
||||||
p12-password: ${{ secrets.CERT_PASSWD }}
|
p12-password: ${{ secrets.CERT_PASSWD }}
|
||||||
- id: vars
|
|
||||||
run: |
|
|
||||||
echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT
|
|
||||||
- name: "Setup build env"
|
- name: "Setup build env"
|
||||||
run: |
|
run: |
|
||||||
echo "" >> gradle.properties
|
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 "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties
|
||||||
echo buildkonfig.flavor=release >> gradle.properties
|
echo buildkonfig.flavor=release >> gradle.properties
|
||||||
- name: "Setup signing config"
|
- name: "Setup signing config"
|
||||||
@ -93,13 +90,10 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
- id: vars
|
|
||||||
run: |
|
|
||||||
echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT
|
|
||||||
- name: "Setup build env"
|
- name: "Setup build env"
|
||||||
run: |
|
run: |
|
||||||
echo "" >> gradle.properties
|
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 "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties
|
||||||
echo buildkonfig.flavor=release >> gradle.properties
|
echo buildkonfig.flavor=release >> gradle.properties
|
||||||
- name: "./gradlew :desktopApp:bundleFlatpak"
|
- name: "./gradlew :desktopApp:bundleFlatpak"
|
||||||
@ -132,12 +126,10 @@ jobs:
|
|||||||
java-version: |
|
java-version: |
|
||||||
11
|
11
|
||||||
17
|
17
|
||||||
- id: vars
|
|
||||||
run: |
|
|
||||||
echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT
|
|
||||||
- name: "Setup build env"
|
- name: "Setup build env"
|
||||||
run: |
|
run: |
|
||||||
echo "" >> gradle.properties
|
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 "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties
|
||||||
echo buildkonfig.flavor=release >> gradle.properties
|
echo buildkonfig.flavor=release >> gradle.properties
|
||||||
- name: "./gradlew :desktopApp:packageMsi"
|
- name: "./gradlew :desktopApp:packageMsi"
|
||||||
@ -164,15 +156,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
- id: vars
|
|
||||||
run: |
|
|
||||||
echo name=tag::${GITHUB_REF:11} >> $GITHUB_OUTPUT
|
|
||||||
- name: "Prepare env"
|
- name: "Prepare env"
|
||||||
run: |
|
run: |
|
||||||
echo ${{ secrets.KEYSTORE_B64 }} | base64 -d | zcat >> androidApp/keyguard-release.keystore
|
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.KEYSTORE_PROPS_B64 }} | base64 -d | zcat >> androidApp/keyguard-release.properties
|
||||||
echo ${{ secrets.GOOGLE_SERVICES }} | base64 -d | zcat >> androidApp/google-services.json
|
echo ${{ secrets.GOOGLE_SERVICES }} | base64 -d | zcat >> androidApp/google-services.json
|
||||||
echo "" >> gradle.properties
|
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 "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties
|
||||||
echo buildkonfig.flavor=release >> gradle.properties
|
echo buildkonfig.flavor=release >> gradle.properties
|
||||||
- name: "Check and Build licenses"
|
- name: "Check and Build licenses"
|
||||||
@ -239,12 +229,13 @@ jobs:
|
|||||||
path: artifacts
|
path: artifacts
|
||||||
- id: vars
|
- id: vars
|
||||||
run: |
|
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"
|
- name: "Create release"
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
with:
|
with:
|
||||||
name: Release ${{ steps.vars.outputs.tag }}
|
name: Release ${{ steps.vars.outputs.date }}
|
||||||
body: ${{ steps.changelog.outputs.changelog }}
|
body: ${{ steps.changelog.outputs.changelog }}
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
files: |
|
files: |
|
||||||
|
Loading…
x
Reference in New Issue
Block a user