Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop' into release/2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dinhlongviolin1 committed Sep 30, 2022
2 parents 2717024 + 00fa2ad commit 68a3e2c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@ jobs:
run: |
echo """
import json, sys, os
with open(f"src{os.sep}taipy{os.sep}gui{os.sep}version.json") as version_file:
with open(f\"src{os.sep}taipy{os.sep}gui{os.sep}version.json\") as version_file:
version_o = json.load(version_file)
version = f'{version_o.get("major")}.{version_o.get("minor")}.{version_o.get("patch")}'
if vext := version_o.get("ext"):
version = f'{version_o.get(\"major\")}.{version_o.get(\"minor\")}.{version_o.get(\"patch\")}'
if vext := version_o.get(\"ext\"):
version = f'{version}.{vext}'
if version != sys.argv[1]:
raise ValueError(f"Invalid version {version} / {sys.argv[1]}")
raise ValueError(f\"Invalid version {version} / {sys.argv[1]}\")
""" > /tmp/check1.py
python /tmp/check1.py "${{ github.event.inputs.version }}"
- name: Validate branch name
run: |
echo """
import json, sys, os
with open(f"src{os.sep}taipy{os.sep}gui{os.sep}version.json") as version_file:
with open(f\"src{os.sep}taipy{os.sep}gui{os.sep}version.json\") as version_file:
version = json.load(version_file)
if f'release/{version.get("major")}.{version.get("minor")}' != sys.argv[1]:
if f'release/{version.get(\"major\")}.{version.get(\"minor\")}' != sys.argv[1]:
raise ValueError('Branch name mismatch')
""" > /tmp/check.py
python /tmp/check.py "${{ steps.extract_branch.outputs.branch }}"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ jobs:
run: |
echo """
import json, sys, os
with open(f"src{os.sep}taipy{os.sep}gui{os.sep}version.json") as version_file:
with open(f\"src{os.sep}taipy{os.sep}gui{os.sep}version.json\") as version_file:
version_o = json.load(version_file)
version = f'{version_o.get("major")}.{version_o.get("minor")}.{version_o.get("patch")}'
if vext := version_o.get("ext"):
version = f'{version_o.get(\"major\")}.{version_o.get(\"minor\")}.{version_o.get(\"patch\")}'
if vext := version_o.get(\"ext\"):
version = f'{version}.{vext}'
if version != sys.argv[1]:
raise ValueError(f"Invalid version {version} / {sys.argv[1]}")
raise ValueError(f\"Invalid version {version} / {sys.argv[1]}\")
""" > /tmp/check1.py
python /tmp/check1.py "${{ github.event.inputs.version }}"
- name: Validate branch name
run: |
echo """
import json, sys, os
with open(f"src{os.sep}taipy{os.sep}gui{os.sep}version.json") as version_file:
with open(f\"src{os.sep}taipy{os.sep}gui{os.sep}version.json\") as version_file:
version = json.load(version_file)
if f'release/{version.get("major")}.{version.get("minor")}' != sys.argv[1]:
if f'release/{version.get(\"major\")}.{version.get(\"minor\")}' != sys.argv[1]:
raise ValueError('Branch name mismatch')
""" > /tmp/check.py
python /tmp/check.py "${{ steps.extract_branch.outputs.branch }}"
Expand Down

0 comments on commit 68a3e2c

Please sign in to comment.