Skip to content

Commit a0f7414

Browse files
gvatsal60gvatsal60
authored
Merge branch 'andmpel:master' into fix/update_util_VG
2 parents 2e435a4 + f2617a6 commit a0f7414

File tree

10 files changed

+317
-224
lines changed

10 files changed

+317
-224
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
}
3535
}
3636
},
37-
"features": {
38-
"ghcr.io/gvatsal60/dev-container-features/sonarlint": "latest"
39-
},
4037
"image": "mcr.microsoft.com/devcontainers/go:latest",
4138
"runArgs": [
4239
"--rm",

‎.github/workflows/macup_build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ jobs:
2121
run: go mod download
2222
- name: Build Go project
2323
run: make all
24-
- name: Run Go tests
25-
run: make test
24+
# - name: Run Go tests
25+
# run: make test

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: sync-pre-commit-deps
77
# Pre-commit hooks for general file checks
88
- repo: https://github.com/pre-commit/pre-commit-hooks
9-
rev: "v5.0.0"
9+
rev: "v6.0.0"
1010
hooks:
1111
- id: check-added-large-files
1212
- id: check-case-conflict
@@ -27,7 +27,7 @@ repos:
2727
- id: trailing-whitespace
2828
# ShellCheck hook for linting shell scripts
2929
- repo: https://github.com/shellcheck-py/shellcheck-py
30-
rev: "v0.10.0.1"
30+
rev: "v0.11.0.1"
3131
hooks:
3232
- id: shellcheck
3333
name: shellcheck

‎Makefile‎

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,73 @@
11
# Makefile for building `update` binaries for macOS
22

3-
GOOS := darwin
4-
GOARCH_AMD64 := amd64
5-
GOARCH_ARM64 := arm64
3+
# Commands
4+
MKDIR := mkdir -p
5+
RMDIR := rm -rf
6+
7+
# Go environment
8+
## Debug
9+
GCFLAGS := all=-N -l
10+
11+
## Release
12+
GO_FLAGS := -trimpath -mod=readonly
13+
LDFLAGS := -s -w
14+
15+
# Architectures
16+
GOOS := $(shell go env GOOS)
17+
GO_ARCH := $(shell go env GOARCH)
18+
GO_ARCH_AMD64 := amd64
19+
GO_ARCH_ARM64 := arm64
20+
21+
# Binary names and paths
622
BIN_DIR := bin
723
BIN_NAME := macup
824

25+
DEBUG_BIN := $(BIN_DIR)/$(BIN_NAME)_debug
926
BIN_AMD64 := $(BIN_DIR)/$(BIN_NAME)_amd64
1027
BIN_ARM64 := $(BIN_DIR)/$(BIN_NAME)_arm64
1128
BIN_UNIVERSAL := $(BIN_DIR)/$(BIN_NAME)
1229

13-
.PHONY: all clean test build universal
30+
# Build commands
31+
DEBUG_CMD = go build -gcflags="$(GCFLAGS)" -x -v >/dev/null
32+
BUILD_CMD = GOFLAGS="$(GO_FLAGS)" go build -ldflags="$(LDFLAGS)"
1433

15-
all: clean build universal
34+
.PHONY: all clean test debug build run
1635

17-
build:
18-
@echo "🔧 Creating Binaries"
19-
@GOOS=$(GOOS) GOARCH=$(GOARCH_AMD64) go build -o $(BIN_AMD64)
20-
@GOOS=$(GOOS) GOARCH=$(GOARCH_ARM64) go build -o $(BIN_ARM64)
21-
@echo "✅ Binary Created: $(BIN_AMD64), $(BIN_ARM64)"
36+
all: clean build
37+
38+
debug:
39+
@echo "Creating Debug Binary"
40+
@$(MKDIR) $(BIN_DIR)
41+
@$(DEBUG_CMD) -o $(DEBUG_BIN)
42+
@echo "Debug Binary Created: $(DEBUG_BIN)"
2243

23-
universal:
24-
@command -v lipo >/dev/null 2>&1 || { echo >&2 "⚠️ lipo not found. Run 'xcode-select --install' on macOS."; exit 1; }
25-
@echo "🔧 Creating Universal Binary"
26-
@lipo -create -output $(BIN_UNIVERSAL) $(BIN_AMD64) $(BIN_ARM64)
27-
@echo "✅ Universal Binary Created: $(BIN_UNIVERSAL)"
44+
run: debug
45+
@echo "Running Debug Binary"
46+
@$(DEBUG_BIN)
47+
48+
build:
49+
@echo "Building Binary"
50+
@$(MKDIR) $(BIN_DIR)
51+
ifeq ($(shell go env GOHOSTOS), darwin)
52+
@echo "Detected macOS — attempting universal build"
53+
@if command -v lipo >/dev/null 2>&1; then \
54+
GOARCH=$(GO_ARCH_AMD64) $(BUILD_CMD) -o $(BIN_AMD64); \
55+
GOARCH=$(GO_ARCH_ARM64) $(BUILD_CMD) -o $(BIN_ARM64); \
56+
lipo -create -output $(UNIVERSAL_BINARY) $(BIN_AMD64) $(BIN_ARM64); \
57+
echo "Universal binary created at $(BIN_UNIVERSAL)"; \
58+
else \
59+
echo "'lipo' not found. Please install Xcode Command Line Tools: xcode-select --install"; \
60+
fi
61+
else
62+
@echo "Skipping universal binary creation (not macOS)"
63+
@echo "Building native binary for $(GOOS) ($(GO_ARCH))"
64+
@$(BUILD_CMD) -o $(BIN_UNIVERSAL)
65+
endif
2866

2967
test:
30-
@echo "🧪 Running Tests"
68+
@echo "Running Tests"
3169
@go test ./... -v
3270

3371
clean:
34-
@echo "🧹 Cleaning Up"
35-
@rm -rf $(BIN_DIR)
72+
@echo "Cleaning Up"
73+
@$(RMDIR) $(BIN_DIR)

‎go.mod‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
module macup
22

3-
go 1.24.3
3+
go 1.24.4
4+
5+
require github.com/AlecAivazis/survey/v2 v2.3.7
46

57
require (
6-
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
78
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
8-
github.com/mattn/go-colorable v0.1.2 // indirect
9-
github.com/mattn/go-isatty v0.0.8 // indirect
10-
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
11-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
12-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
13-
golang.org/x/text v0.4.0 // indirect
9+
github.com/mattn/go-colorable v0.1.14 // indirect
10+
github.com/mattn/go-isatty v0.0.20 // indirect
11+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
12+
golang.org/x/sys v0.35.0 // indirect
13+
golang.org/x/term v0.34.0 // indirect
14+
golang.org/x/text v0.28.0 // indirect
1415
)

‎go.sum‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
22
github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
3+
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
34
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
5+
github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
46
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
57
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
69
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
10+
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
711
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
812
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
913
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
10-
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
1114
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
12-
github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
15+
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
16+
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
1317
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
14-
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
18+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
19+
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
1520
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
21+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
22+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
23+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1624
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1725
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
26+
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
1827
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1928
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
2029
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -30,19 +39,24 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
3039
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3140
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3241
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
33-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
3442
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
43+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
44+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
45+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
3546
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
36-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
3747
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
48+
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
49+
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
3850
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
3951
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
4052
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
41-
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
4253
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
54+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
55+
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
4356
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
4457
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
4558
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
4659
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4760
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
61+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
4862
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)