Compare commits

..

3 Commits

Author SHA1 Message Date
IamTheFij 76be0d8967 Bump version to 1.1.1
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/tag Build is failing Details
2023-04-04 09:42:37 -07:00
IamTheFij 45ffa8efbd Use fork of awgo supporting alfred5 2023-04-04 09:42:37 -07:00
IamTheFij cfb231b0c6 Update pre-commit hooks
continuous-integration/drone/push Build is failing Details
2023-04-04 08:58:58 -07:00
2 changed files with 2 additions and 50 deletions

View File

@ -866,7 +866,7 @@
</dict>
</dict>
<key>version</key>
<string>1.1.0</string>
<string>1.1.1</string>
<key>webaddress</key>
<string></string>
</dict>

View File

@ -42,60 +42,12 @@ func init() {
}
}
func CompileBinaryForArch(goos, goarch, outputPath string) error {
env := info.Env()
if goos != "" {
env["GOOS"] = goos
}
if goarch != "" {
env["GOARCH"] = goarch
}
err := sh.RunWith(env, "go", "build", "-o", outputPath, ".")
if err != nil {
return fmt.Errorf("error building %s %s binary %w", goos, goarch, err)
}
return nil
}
func CompileUniversalBinary() error {
armPath := filepath.Join(buildDir, "alfred-yubico-auth_arm64")
// amdPath := filepath.Join(buildDir, "alfred-yubico-auth_amd64")
// NOTE: Universal binaries can't be compiled because we can't cross compile against the scard
// libraries due to missing headers
if err := CompileBinaryForArch("darwin", "arm64", armPath); err != nil {
return fmt.Errorf("error compiling universal binary %w", err)
}
/*
* if err := CompileBinaryForArch("darwin", "amd64", amdPath); err != nil {
* return fmt.Errorf("error compiling universal binary %w", err)
* }
*/
if err := sh.RunWith(
info.Env(),
"lipo",
"-create",
"-output",
binPath,
armPath,
// amdPath,
); err != nil {
return fmt.Errorf("failed combining binaries to universal %w", err)
}
return nil
}
// Build workflow.
func Build() error {
mg.Deps(cleanBuild)
fmt.Println("Building...")
if err := CompileUniversalBinary(); err != nil {
if err := sh.RunWith(info.Env(), "go", "build", "-o", binPath, "."); err != nil {
return fmt.Errorf("error building binary %w", err)
}