fix(just): properly handle multiple tags (#13734)

sigma · web-flow · commit bfb9de2081a8 · 2025-01-13T20:27:21.000Z
* fix(just): properly handle multiple tags

* chore(just): rename just/ -&gt; justfiles/

The current behavior is confusing for people who don't have `just`
installed: instead of a recognizable "command not found", they could
see a "Permission denied" (if . is in the PATH I suppose).
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # provide JUSTFLAGS for just-backed targets
-include ./just/flags.mk
+include ./justfiles/flags.mk
 
 BEDROCK_TAGS_REMOTE?=origin
 OP_STACK_GO_BUILDER?=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
diff --git a/justfiles/default.just b/justfiles/default.just
diff --git a/justfiles/deprecated.mk b/justfiles/deprecated.mk
diff --git a/justfiles/flags.mk b/justfiles/flags.mk
diff --git a/justfiles/git.just b/justfiles/git.just
@@ -6,13 +6,13 @@ GITDATE := env('GITDATE', `git show -s --format='%ct' 2> /dev/null|| true`)
 
 _PROJECT := shell("basename $1", justfile_directory())
 
-_ALL_TAGS := shell("git tag --points-at $1 2> /dev/null || true", GITCOMMIT)
+_ALL_TAGS := shell("git tag --sort=creatordate --points-at $1 2> /dev/null || true", GITCOMMIT)
 
-_PROJECT_TAGS := shell("echo $1 | grep ^$2/ | sed s:$2/:: | sort -V", _ALL_TAGS, _PROJECT)
+_PROJECT_TAGS := shell("echo $1 | grep ^$2/ | tr ' ' '\n' | sed s:$2/:: | sort -V", _ALL_TAGS, _PROJECT)
 
-_PREFERRED_TAG := shell("echo $1 | grep -v -- '-rc' | tail -n 1", _PROJECT_TAGS)
+_PREFERRED_TAG := shell("echo $1 | tr ' ' '\n' | grep -v -- '-rc' | tail -n 1", _PROJECT_TAGS)
 
-_LAST_TAG := shell("echo $1 | tail -n 1", _PROJECT_TAGS)
+_LAST_TAG := shell("echo $1 | tr ' ' '\n' | tail -n 1", _PROJECT_TAGS)
 
 # Find version tag, prioritizing non-rc release tags
 VERSION := shell('if [ -z "$1" ]; then
diff --git a/justfiles/go.just b/justfiles/go.just
diff --git a/op-alt-da/Makefile b/op-alt-da/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := da-server clean test
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-alt-da/justfile b/op-alt-da/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/op-batcher/Makefile b/op-batcher/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-batcher clean test fuzz
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-batcher/justfile b/op-batcher/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/op-chain-ops/Makefile b/op-chain-ops/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := ecotone-scalar receipt-reference-builder test op-deployer fuzz sync-standard-version
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-chain-ops/justfile b/op-chain-ops/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _VERSION_META_STR := if VERSION_META != "" { "+" + VERSION_META } else { "" }
diff --git a/op-challenger/Makefile b/op-challenger/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-challenger clean test fuzz visualize
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-challenger/justfile b/op-challenger/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _VERSION_META_STR := if VERSION_META != "" { "+" + VERSION_META } else { "" }
diff --git a/op-conductor/Makefile b/op-conductor/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-conductor clean test generate-mocks
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-conductor/justfile b/op-conductor/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/op-dispute-mon/Makefile b/op-dispute-mon/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-dispute-mon clean test
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-dispute-mon/justfile b/op-dispute-mon/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/op-node/Makefile b/op-node/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-node clean test fuzz generate-mocks readme
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-node/justfile b/op-node/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/op-proposer/Makefile b/op-proposer/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-proposer clean test
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-proposer/justfile b/op-proposer/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/op-service/Makefile b/op-service/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := test generate-mocks fuzz
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-service/justfile b/op-service/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Run tests
 test: (go_test "./...")
diff --git a/op-supervisor/Makefile b/op-supervisor/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-supervisor clean test
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-supervisor/justfile b/op-supervisor/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/op-wheel/Makefile b/op-wheel/Makefile
@@ -1,3 +1,3 @@
 DEPRECATED_TARGETS := op-wheel
 
-include ../just/deprecated.mk
+include ../justfiles/deprecated.mk
diff --git a/op-wheel/justfile b/op-wheel/justfile
@@ -1,4 +1,4 @@
-import '../just/go.just'
+import '../justfiles/go.just'
 
 # Build ldflags string
 _LDFLAGSSTRING := "'" + trim(
diff --git a/ops/docker/op-stack-go/Dockerfile.dockerignore b/ops/docker/op-stack-go/Dockerfile.dockerignore
@@ -20,5 +20,5 @@
 !/op-alt-da
 !/go.mod
 !/go.sum
-!/just
+!/justfiles
 !/mise.toml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`DEPRECATED_TARGETS := da-server clean test`
`2`	`2`
`3`		`-include ../just/deprecated.mk`
	`3`	`+include ../justfiles/deprecated.mk`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import '../just/go.just'`
	`1`	`+import '../justfiles/go.just'`
`2`	`2`
`3`	`3`	`# Build ldflags string`
`4`	`4`	`_LDFLAGSSTRING := "'" + trim(`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`DEPRECATED_TARGETS := op-batcher clean test fuzz`
`2`	`2`
`3`		`-include ../just/deprecated.mk`
	`3`	`+include ../justfiles/deprecated.mk`