Merge pull request #7783 from shaspitz/shawn/fix-git-commit-print

fix(op-node): git commit print

bedrock-devnet/devnet/__init__.py

@@ -94,8 +94,13 @@ def main():
         devnet_l1_genesis(paths)
         return
 
-    log.info('Building docker images')
-    run_command(['docker', 'compose', 'build', '--progress', 'plain'], cwd=paths.ops_bedrock_dir, env={
+    git_commit = subprocess.run(['git', 'rev-parse', 'HEAD'], capture_output=True, text=True).stdout.strip()
+    git_date = subprocess.run(['git', 'show', '-s', "--format=%ct"], capture_output=True, text=True).stdout.strip()
+
+    log.info(f'Building docker images for git commit {git_commit} ({git_date})')
+    run_command(['docker', 'compose', 'build', '--progress', 'plain',
+                 '--build-arg', f'GIT_COMMIT={git_commit}', '--build-arg', f'GIT_DATE={git_date}'],
+                cwd=paths.ops_bedrock_dir, env={
         'PWD': paths.ops_bedrock_dir,
         'DOCKER_BUILDKIT': '1', # (should be available by default in later versions, but explicitly enable it anyway)
         'COMPOSE_DOCKER_CLI_BUILD': '1'  # use the docker cache

op-challenger/cmd/main.go

@@ -24,7 +24,11 @@ var (
 var VersionWithMeta = func() string {
 	v := version.Version
 	if GitCommit != "" {
-		v += "-" + GitCommit[:8]
+		if len(GitCommit) >= 8 {
+			v += "-" + GitCommit[:8]
+		} else {
+			v += "-" + GitCommit
+		}
 	}
 	if GitDate != "" {
 		v += "-" + GitDate

op-node/cmd/main.go

@@ -32,7 +32,11 @@ var (
 var VersionWithMeta = func() string {
 	v := version.Version
 	if GitCommit != "" {
-		v += "-" + GitCommit[:8]
+		if len(GitCommit) >= 8 {
+			v += "-" + GitCommit[:8]
+		} else {
+			v += "-" + GitCommit
+		}
 	}
 	if GitDate != "" {
 		v += "-" + GitDate

op-program/host/cmd/main.go

@@ -21,7 +21,11 @@ var (
 var VersionWithMeta = func() string {
 	v := version.Version
 	if GitCommit != "" {
-		v += "-" + GitCommit[:8]
+		if len(GitCommit) >= 8 {
+			v += "-" + GitCommit[:8]
+		} else {
+			v += "-" + GitCommit
+		}
 	}
 	if GitDate != "" {
 		v += "-" + GitDate