mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2025-08-11 17:50:58 +00:00
support runner.arch (#1290)
* support runner.arch Signed-off-by: Fabian Kammel <fk@edgeless.systems> * add arch to runner definition Signed-off-by: Fabian Kammel <fk@edgeless.systems> * get architecture from docker Signed-off-by: Fabian Kammel <fk@edgeless.systems> * Update pkg/container/docker_run.go Co-authored-by: ChristopherHX <christopher.homberger@web.de> * lint: goimport file Signed-off-by: Fabian Kammel <fk@edgeless.systems> Co-authored-by: Casey Lee <caseypl@amazon.com> Co-authored-by: ChristopherHX <christopher.homberger@web.de> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
parent
5a351d33df
commit
c0aff7b82e
5 changed files with 26 additions and 0 deletions
|
@ -276,6 +276,26 @@ func GetHostInfo(ctx context.Context) (info types.Info, err error) {
|
|||
return info, nil
|
||||
}
|
||||
|
||||
// Arch fetches values from docker info and translates architecture to
|
||||
// GitHub actions compatible runner.arch values
|
||||
// https://github.com/github/docs/blob/main/data/reusables/actions/runner-arch-description.md
|
||||
func RunnerArch(ctx context.Context) string {
|
||||
info, err := GetHostInfo(ctx)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
archMapper := map[string]string{
|
||||
"x86_64": "X64",
|
||||
"386": "x86",
|
||||
"aarch64": "arm64",
|
||||
}
|
||||
if arch, ok := archMapper[info.Architecture]; ok {
|
||||
return arch
|
||||
}
|
||||
return info.Architecture
|
||||
}
|
||||
|
||||
func (cr *containerReference) connect() common.Executor {
|
||||
return func(ctx context.Context) error {
|
||||
if cr.cli != nil {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue