obitools/obitools4
2
0
Fork 0
mirror of https://github.com/metabarcoding/obitools4.git synced 2026-03-25 05:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build improvements and Go version update

Browse Source 
- Update Go version from 1.25.0 to 1.26.1 in go.mod and go.work
- Fix Makefile: quote LDFLAGS to handle spaces safely in -ldflags
- Improve build error handling: on failure, cat log then cleanup and exit with error code
- Update install_obitools.sh: properly set GOROOT, GOPATH, and GOTOOLCHAIN; ensure GOPATH directory is created
This commit is contained in:
Eric Coissac
2026-03-13 19:03:22 +01:00
parent 43125f9f5e
commit 2f7be10b5d
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -12,7 +12,7 @@ NC := \033[0m
GOFLAGS= GOFLAGS=
LDFLAGS= LDFLAGS=
GOCMD=go GOCMD=go
GOBUILD=$(GOCMD) build $(GOFLAGS) $(if $(LDFLAGS),-ldflags='$(LDFLAGS)') GOBUILD=$(GOCMD) build $(GOFLAGS) $(if $(LDFLAGS),-ldflags="$(LDFLAGS)")
GOGENERATE=$(GOCMD) generate GOGENERATE=$(GOCMD) generate
GOCLEAN=$(GOCMD) clean GOCLEAN=$(GOCMD) clean
GOTEST=$(GOCMD) test GOTEST=$(GOCMD) test
@@ -51,7 +51,7 @@ $(OBITOOLS_PREFIX)$(notdir $(1)): $(BUILD_DIR) $(1) pkg/obioptions/version.go
@echo -n - Building obitool $(notdir $(1))... @echo -n - Building obitool $(notdir $(1))...
@$(GOBUILD) -o $(BUILD_DIR)/$(OBITOOLS_PREFIX)$(notdir $(1)) ./$(1) \ @$(GOBUILD) -o $(BUILD_DIR)/$(OBITOOLS_PREFIX)$(notdir $(1)) ./$(1) \
2> $(OBITOOLS_PREFIX)$(notdir $(1)).log \ 2> $(OBITOOLS_PREFIX)$(notdir $(1)).log \
|| cat $(OBITOOLS_PREFIX)$(notdir $(1)).log || { cat $(OBITOOLS_PREFIX)$(notdir $(1)).log; rm -f $(OBITOOLS_PREFIX)$(notdir $(1)).log; exit 1; }
@rm -f $(OBITOOLS_PREFIX)$(notdir $(1)).log @rm -f $(OBITOOLS_PREFIX)$(notdir $(1)).log
@echo Done. @echo Done.
endef endef

2
go.mod
View File

@@ -1,6 +1,6 @@
module git.metabarcoding.org/obitools/obitools4/obitools4 module git.metabarcoding.org/obitools/obitools4/obitools4
go 1.25.0 go 1.26.1
require ( require (
github.com/DavidGamba/go-getoptions v0.33.0 github.com/DavidGamba/go-getoptions v0.33.0

2
go.work
View File

@@ -1,3 +1,3 @@
go 1.25.0 go 1.26.1
use . use .

10
install_obitools.sh
View File

@@ -185,14 +185,16 @@ echo "Installing Go from: $GOURL" 1>&2
curl --progress-bar "$GOURL" | tar zxf - curl --progress-bar "$GOURL" | tar zxf -
PATH="$(pwd)/go/bin:$PATH" export GOROOT="$(pwd)/go"
PATH="${GOROOT}/bin:$PATH"
export PATH export PATH
GOPATH="$(pwd)/go" export GOPATH="$(pwd)/gopath"
export GOPATH
export GOCACHE="$(pwd)/cache" export GOCACHE="$(pwd)/cache"
export GOTOOLCHAIN=local
echo "GOROOT=$GOROOT" 1>&2
echo "GOCACHE=$GOCACHE" 1>&2 echo "GOCACHE=$GOCACHE" 1>&2
mkdir -p "$GOCACHE" mkdir -p "$GOPATH" "$GOCACHE"
# Download OBITools4 source # Download OBITools4 source
echo "Downloading OBITools4 v${VERSION}..." 1>&2 echo "Downloading OBITools4 v${VERSION}..." 1>&2