mirror of
https://gitea.plemya-x.ru/Plemya-x/ALR.git
synced 2025-01-10 17:26:45 +00:00
fix: add alt prefix for release
This commit is contained in:
parent
c105cf2cbb
commit
eb1c1a1d8c
1 changed files with 28 additions and 25 deletions
|
@ -36,6 +36,9 @@ import (
|
||||||
_ "github.com/goreleaser/nfpm/v2/arch"
|
_ "github.com/goreleaser/nfpm/v2/arch"
|
||||||
_ "github.com/goreleaser/nfpm/v2/deb"
|
_ "github.com/goreleaser/nfpm/v2/deb"
|
||||||
_ "github.com/goreleaser/nfpm/v2/rpm"
|
_ "github.com/goreleaser/nfpm/v2/rpm"
|
||||||
|
"mvdan.cc/sh/v3/expand"
|
||||||
|
"mvdan.cc/sh/v3/interp"
|
||||||
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
"github.com/goreleaser/nfpm/v2"
|
"github.com/goreleaser/nfpm/v2"
|
||||||
"github.com/goreleaser/nfpm/v2/files"
|
"github.com/goreleaser/nfpm/v2/files"
|
||||||
|
@ -52,9 +55,6 @@ import (
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"plemya-x.ru/alr/pkg/loggerctx"
|
||||||
"plemya-x.ru/alr/pkg/manager"
|
"plemya-x.ru/alr/pkg/manager"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
"plemya-x.ru/alr/pkg/repos"
|
||||||
"mvdan.cc/sh/v3/expand"
|
|
||||||
"mvdan.cc/sh/v3/interp"
|
|
||||||
"mvdan.cc/sh/v3/syntax"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// BuildPackage builds the script at the given path. It returns two slices. One contains the paths
|
// BuildPackage builds the script at the given path. It returns two slices. One contains the paths
|
||||||
|
@ -161,7 +161,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
|
||||||
|
|
||||||
pkgFormat := getPkgFormat(opts.Manager)
|
pkgFormat := getPkgFormat(opts.Manager)
|
||||||
|
|
||||||
pkgInfo, err := buildPkgMetadata(vars, dirs, pkgFormat, append(repoDeps, builtNames...))
|
pkgInfo, err := buildPkgMetadata(vars, dirs, pkgFormat, info, append(repoDeps, builtNames...))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
@ -481,23 +481,18 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire
|
||||||
}
|
}
|
||||||
|
|
||||||
// buildPkgMetadata builds the metadata for the package that's going to be built.
|
// buildPkgMetadata builds the metadata for the package that's going to be built.
|
||||||
func buildPkgMetadata(vars *types.BuildVars, dirs types.Directories, pkgFormat string, deps []string) (*nfpm.Info, error) {
|
func buildPkgMetadata(vars *types.BuildVars, dirs types.Directories, pkgFormat string, info *distro.OSRelease, deps []string) (*nfpm.Info, error) {
|
||||||
pkgInfo := &nfpm.Info{
|
pkgInfo := getBasePkgInfo(vars)
|
||||||
Name: vars.Name,
|
pkgInfo.Description = vars.Description
|
||||||
Description: vars.Description,
|
pkgInfo.Platform = "linux"
|
||||||
Arch: cpu.Arch(),
|
pkgInfo.Homepage = vars.Homepage
|
||||||
Platform: "linux",
|
pkgInfo.License = strings.Join(vars.Licenses, ", ")
|
||||||
Version: vars.Version,
|
pkgInfo.Maintainer = vars.Maintainer
|
||||||
Release: strconv.Itoa(vars.Release),
|
pkgInfo.Overridables = nfpm.Overridables{
|
||||||
Homepage: vars.Homepage,
|
|
||||||
License: strings.Join(vars.Licenses, ", "),
|
|
||||||
Maintainer: vars.Maintainer,
|
|
||||||
Overridables: nfpm.Overridables{
|
|
||||||
Conflicts: vars.Conflicts,
|
Conflicts: vars.Conflicts,
|
||||||
Replaces: vars.Replaces,
|
Replaces: vars.Replaces,
|
||||||
Provides: vars.Provides,
|
Provides: vars.Provides,
|
||||||
Depends: deps,
|
Depends: deps,
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if pkgFormat == "apk" {
|
if pkgFormat == "apk" {
|
||||||
|
@ -507,6 +502,10 @@ func buildPkgMetadata(vars *types.BuildVars, dirs types.Directories, pkgFormat s
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if info.ID == "altlinux" {
|
||||||
|
pkgInfo.Release = "alt" + pkgInfo.Release
|
||||||
|
}
|
||||||
|
|
||||||
if vars.Epoch != 0 {
|
if vars.Epoch != 0 {
|
||||||
pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
|
pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
|
||||||
}
|
}
|
||||||
|
@ -643,16 +642,20 @@ func checkForBuiltPackage(mgr manager.Manager, vars *types.BuildVars, pkgFormat,
|
||||||
return pkgPath, true, nil
|
return pkgPath, true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// pkgFileName returns the filename of the package if it were to be built.
|
func getBasePkgInfo(vars *types.BuildVars) *nfpm.Info {
|
||||||
// This is used to check if the package has already been built.
|
return &nfpm.Info{
|
||||||
func pkgFileName(vars *types.BuildVars, pkgFormat string) (string, error) {
|
|
||||||
pkgInfo := &nfpm.Info{
|
|
||||||
Name: vars.Name,
|
Name: vars.Name,
|
||||||
Arch: cpu.Arch(),
|
Arch: cpu.Arch(),
|
||||||
Version: vars.Version,
|
Version: vars.Version,
|
||||||
Release: strconv.Itoa(vars.Release),
|
Release: strconv.Itoa(vars.Release),
|
||||||
Epoch: strconv.FormatUint(uint64(vars.Epoch), 10),
|
Epoch: strconv.FormatUint(uint64(vars.Epoch), 10),
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// pkgFileName returns the filename of the package if it were to be built.
|
||||||
|
// This is used to check if the package has already been built.
|
||||||
|
func pkgFileName(vars *types.BuildVars, pkgFormat string) (string, error) {
|
||||||
|
pkgInfo := getBasePkgInfo(vars)
|
||||||
|
|
||||||
packager, err := nfpm.Get(pkgFormat)
|
packager, err := nfpm.Get(pkgFormat)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in a new issue