ClementTsang/bottom
1
1
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2024-11-09 12:58:21 +03:00
Code Issues Projects Releases Wiki Activity

ci: default to master branch on tag release (#943)

Browse Source
This commit is contained in:
Clement Tsang 2022-12-31 21:50:17 -05:00 committed by GitHub
parent 0fa11fb5c5
commit 4d5a58c3ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_releases.yml vendored
View File

@ -277,7 +277,7 @@ jobs:
env: env:
CIRRUS_KEY: ${{ secrets.CIRRUS_TOKEN }} CIRRUS_KEY: ${{ secrets.CIRRUS_TOKEN }}
run: | run: |
python ./scripts/cirrus/build.py "${{ github.ref_name }}" "release/" "${{ inputs.caller }}" python ./scripts/cirrus/build.py "${{ github.ref_name }}" "${{ github.ref_type }}" "release/" "${{ inputs.caller }}"
- name: Save release as artifact - name: Save release as artifact
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1 uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1

12
scripts/cirrus/build.py
View File

@ -107,10 +107,16 @@ def main():
key = env["CIRRUS_KEY"] key = env["CIRRUS_KEY"]
branch = args[1] branch = args[1]
dl_path = args[2] if len(args) >= 3 else "" branch_type = args[2]
# TODO: This is a bit of a hack, sorry. You want to properly handle this I suppose with the endpoint you hit.
if branch_type == "tag":
branch = "master"
dl_path = args[3] if len(args) >= 4 else ""
dl_path = Path(dl_path) dl_path = Path(dl_path)
build_type = args[3] if len(args) >= 4 else "build" build_type = args[4] if len(args) >= 5 else "build"
build_id = args[4] if len(args) >= 5 else None build_id = args[5] if len(args) >= 6 else None
# Check if this build has already been completed before. # Check if this build has already been completed before.
if build_id is not None: if build_id is not None: