Befator-Inc-Firmen-Netzwerk/msys2-autobuild
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

Set PACKAGER in autobuild directly

Browse Source 
Instead of depending on the caller to set it.
This commit is contained in:
Christoph Reiter 2022-01-14 16:09:51 +01:00
parent 7c422261fc
commit e93758b39c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@ -148,7 +148,6 @@ jobs:
GITHUB_TOKEN_READONLY: ${{ secrets.GITHUBTOKENREADONLY }} GITHUB_TOKEN_READONLY: ${{ secrets.GITHUBTOKENREADONLY }}
GITHUB_RUN_NAME: ${{ matrix.name }} GITHUB_RUN_NAME: ${{ matrix.name }}
run: | run: |
$env:PACKAGER='CI (msys2-autobuild/' + $env:GITHUB_SHA.Substring(0, 8) + '/' + $env:GITHUB_RUN_ID + ')'
$BUILD_ROOT='C:\' $BUILD_ROOT='C:\'
$MSYS2_ROOT=(msys2 -c 'cygpath -w /') $MSYS2_ROOT=(msys2 -c 'cygpath -w /')
python -u autobuild.py build ${{ matrix.build-args }} "$MSYS2_ROOT" "$BUILD_ROOT" python -u autobuild.py build ${{ matrix.build-args }} "$MSYS2_ROOT" "$BUILD_ROOT"

10
autobuild.py
View File

@ -473,7 +473,15 @@ SigLevel=Never
def get_build_environ() -> Dict[str, str]: def get_build_environ() -> Dict[str, str]:
return os.environ.copy() environ = os.environ.copy()
# Set PACKAGER for makepkg
packager_ref = Config.MAIN_REPO
if "GITHUB_SHA" in environ and "GITHUB_RUN_ID" in environ:
packager_ref += "/" + environ["GITHUB_SHA"][:8] + "/" + environ["GITHUB_RUN_ID"]
environ["PACKAGER"] = f"CI ({packager_ref})"
return environ
def build_package(build_type: BuildType, pkg: Package, msys2_root: _PathLike, builddir: _PathLike) -> None: def build_package(build_type: BuildType, pkg: Package, msys2_root: _PathLike, builddir: _PathLike) -> None: