Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
b0e6d137
Unverified
Commit
b0e6d137
authored
Sep 25, 2024
by
Adrian Sutton
Committed by
GitHub
Sep 25, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cannon: Support the --version argument for multicannon. (#12101)
Pick up the version from the release tag automatically.
parent
106993f8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
4 deletions
+20
-4
Makefile
cannon/Makefile
+2
-2
main.go
cannon/multicannon/main.go
+11
-0
version.go
cannon/multicannon/version/version.go
+6
-0
Dockerfile
ops/docker/op-stack-go/Dockerfile
+1
-2
No files found.
cannon/Makefile
View file @
b0e6d137
...
@@ -4,8 +4,8 @@ VERSION ?= v0.0.0
...
@@ -4,8 +4,8 @@ VERSION ?= v0.0.0
LDFLAGSSTRING
+=
-X
main.GitCommit
=
$(GITCOMMIT)
LDFLAGSSTRING
+=
-X
main.GitCommit
=
$(GITCOMMIT)
LDFLAGSSTRING
+=
-X
main.GitDate
=
$(GITDATE)
LDFLAGSSTRING
+=
-X
main.GitDate
=
$(GITDATE)
LDFLAGSSTRING
+=
-X
github.com/ethereum-optimism/optimism/
op-program
/version.Version
=
$(VERSION)
LDFLAGSSTRING
+=
-X
github.com/ethereum-optimism/optimism/
cannon/multicannon
/version.Version
=
$(VERSION)
LDFLAGSSTRING
+=
-X
github.com/ethereum-optimism/optimism/
op-program
/version.Meta
=
$(VERSION_META)
LDFLAGSSTRING
+=
-X
github.com/ethereum-optimism/optimism/
cannon/multicannon
/version.Meta
=
$(VERSION_META)
LDFLAGS
:=
-ldflags
"
$(LDFLAGSSTRING)
"
LDFLAGS
:=
-ldflags
"
$(LDFLAGSSTRING)
"
# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
...
...
cannon/multicannon/main.go
View file @
b0e6d137
...
@@ -6,15 +6,26 @@ import (
...
@@ -6,15 +6,26 @@ import (
"fmt"
"fmt"
"os"
"os"
"github.com/ethereum-optimism/optimism/cannon/multicannon/version"
opservice
"github.com/ethereum-optimism/optimism/op-service"
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
"github.com/urfave/cli/v2"
"github.com/urfave/cli/v2"
)
)
var
(
GitCommit
=
""
GitDate
=
""
)
// VersionWithMeta holds the textual version string including the metadata.
var
VersionWithMeta
=
opservice
.
FormatVersion
(
version
.
Version
,
GitCommit
,
GitDate
,
version
.
Meta
)
func
main
()
{
func
main
()
{
app
:=
cli
.
NewApp
()
app
:=
cli
.
NewApp
()
app
.
Name
=
"multicannon"
app
.
Name
=
"multicannon"
app
.
Usage
=
"MIPS Fault Proof tool"
app
.
Usage
=
"MIPS Fault Proof tool"
app
.
Description
=
"MIPS Fault Proof tool"
app
.
Description
=
"MIPS Fault Proof tool"
app
.
Version
=
VersionWithMeta
app
.
Commands
=
[]
*
cli
.
Command
{
app
.
Commands
=
[]
*
cli
.
Command
{
LoadELFCommand
,
LoadELFCommand
,
WitnessCommand
,
WitnessCommand
,
...
...
cannon/multicannon/version/version.go
0 → 100644
View file @
b0e6d137
package
version
var
(
Version
=
"v0.0.0"
Meta
=
"dev"
)
ops/docker/op-stack-go/Dockerfile
View file @
b0e6d137
...
@@ -51,8 +51,7 @@ ARG TARGETARCH
...
@@ -51,8 +51,7 @@ ARG TARGETARCH
#FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-challenger:v1.1.0 AS cannon-builder-0
#FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-challenger:v1.1.0 AS cannon-builder-0
FROM
--platform=$BUILDPLATFORM builder AS cannon-builder
FROM
--platform=$BUILDPLATFORM builder AS cannon-builder
# note: bump this CANNON_VERSION when the VM behavior changes
ARG
CANNON_VERSION=v0.0.0
ARG
CANNON_VERSION=v1.0.0
# uncomment these lines once there's a new Cannon version available
# uncomment these lines once there's a new Cannon version available
#COPY --from=cannon-builder-0 /usr/local/bin/cannon ./cannon/multicannon/embeds/cannon-0
#COPY --from=cannon-builder-0 /usr/local/bin/cannon ./cannon/multicannon/embeds/cannon-0
#COPY --from=cannon-builder-0 /usr/local/bin/cannon ./cannon/multicannon/embeds/cannon-1
#COPY --from=cannon-builder-0 /usr/local/bin/cannon ./cannon/multicannon/embeds/cannon-1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment