Skip to content

Commit ab1caa0

Browse files
Merge branch 'develop' into sc/asr-single-root
2 parents 36f61a7 + 6c44b0b commit ab1caa0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+146
-2192
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# provide JUSTFLAGS for just-backed targets
2-
include ./just/flags.mk
2+
include ./justfiles/flags.mk
33

44
BEDROCK_TAGS_REMOTE?=origin
55
OP_STACK_GO_BUILDER?=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
File renamed without changes.
File renamed without changes.
File renamed without changes.

just/git.just renamed to justfiles/git.just

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ GITDATE := env('GITDATE', `git show -s --format='%ct' 2> /dev/null|| true`)
66

77
_PROJECT := shell("basename $1", justfile_directory())
88

9-
_ALL_TAGS := shell("git tag --points-at $1 2> /dev/null || true", GITCOMMIT)
9+
_ALL_TAGS := shell("git tag --sort=creatordate --points-at $1 2> /dev/null || true", GITCOMMIT)
1010

11-
_PROJECT_TAGS := shell("echo $1 | grep ^$2/ | sed s:$2/:: | sort -V", _ALL_TAGS, _PROJECT)
11+
_PROJECT_TAGS := shell("echo $1 | grep ^$2/ | tr ' ' '\n' | sed s:$2/:: | sort -V", _ALL_TAGS, _PROJECT)
1212

13-
_PREFERRED_TAG := shell("echo $1 | grep -v -- '-rc' | tail -n 1", _PROJECT_TAGS)
13+
_PREFERRED_TAG := shell("echo $1 | tr ' ' '\n' | grep -v -- '-rc' | tail -n 1", _PROJECT_TAGS)
1414

15-
_LAST_TAG := shell("echo $1 | tail -n 1", _PROJECT_TAGS)
15+
_LAST_TAG := shell("echo $1 | tr ' ' '\n' | tail -n 1", _PROJECT_TAGS)
1616

1717
# Find version tag, prioritizing non-rc release tags
1818
VERSION := shell('if [ -z "$1" ]; then
File renamed without changes.

op-alt-da/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
DEPRECATED_TARGETS := da-server clean test
22

3-
include ../just/deprecated.mk
3+
include ../justfiles/deprecated.mk

op-alt-da/justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '../just/go.just'
1+
import '../justfiles/go.just'
22

33
# Build ldflags string
44
_LDFLAGSSTRING := "'" + trim(

op-batcher/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
DEPRECATED_TARGETS := op-batcher clean test fuzz
22

3-
include ../just/deprecated.mk
3+
include ../justfiles/deprecated.mk

op-batcher/justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '../just/go.just'
1+
import '../justfiles/go.just'
22

33
# Build ldflags string
44
_LDFLAGSSTRING := "'" + trim(

0 commit comments

Comments
 (0)