From e26c110be5a5f07a6d4011a5e3fe9e4df1f394e7 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Tue, 6 Dec 2022 14:07:22 -0800 Subject: [PATCH 1/2] Copy .git during Docker build This ensure that the git metadata is available to make when it is building the binaries. --- op-batcher/Dockerfile | 1 + op-chain-ops/Dockerfile | 1 + op-node/Dockerfile | 1 + op-proposer/Dockerfile | 1 + 4 files changed, 4 insertions(+) diff --git a/op-batcher/Dockerfile b/op-batcher/Dockerfile index ea50558fbfa6e..b2b1c8e450f2a 100644 --- a/op-batcher/Dockerfile +++ b/op-batcher/Dockerfile @@ -9,6 +9,7 @@ COPY ./op-node /app/op-node COPY ./op-proposer /app/op-proposer COPY ./op-service /app/op-service COPY ./op-batcher /app/op-batcher +COPY ./.git /app/.git WORKDIR /app/op-batcher diff --git a/op-chain-ops/Dockerfile b/op-chain-ops/Dockerfile index 19bf720667105..532ec429830c8 100644 --- a/op-chain-ops/Dockerfile +++ b/op-chain-ops/Dockerfile @@ -6,6 +6,7 @@ COPY ./op-chain-ops/docker.go.work /app/go.work COPY ./op-chain-ops /app/op-chain-ops COPY ./op-bindings /app/op-bindings COPY ./op-node /app/op-node +COPY ./.git /app/.git WORKDIR /app/op-chain-ops diff --git a/op-node/Dockerfile b/op-node/Dockerfile index 56556a4a8c05e..de91ba46ac337 100644 --- a/op-node/Dockerfile +++ b/op-node/Dockerfile @@ -8,6 +8,7 @@ COPY ./op-bindings /app/op-bindings COPY ./op-node /app/op-node COPY ./op-chain-ops /app/op-chain-ops COPY ./op-service /app/op-service +COPY ./.git /app/.git WORKDIR /app/op-node diff --git a/op-proposer/Dockerfile b/op-proposer/Dockerfile index cf5fa92eac7b6..d696c7fcbcac8 100644 --- a/op-proposer/Dockerfile +++ b/op-proposer/Dockerfile @@ -8,6 +8,7 @@ COPY ./op-bindings /app/op-bindings COPY ./op-node /app/op-node COPY ./op-proposer /app/op-proposer COPY ./op-service /app/op-service +COPY ./.git /app/.git WORKDIR /app/op-proposer From 8ec44c7aa37a65c722585147bd04998c93af7598 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Tue, 6 Dec 2022 14:24:27 -0800 Subject: [PATCH 2/2] Prompt to update version inside op binaries This is easier to do than writing a script to update the individual versions, but should be enough to remind the developer cutting the release to do the updates. --- ops/scripts/tag-bedrock-go-modules.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ops/scripts/tag-bedrock-go-modules.sh b/ops/scripts/tag-bedrock-go-modules.sh index 57ccb48363d29..f09f6c0a522ca 100755 --- a/ops/scripts/tag-bedrock-go-modules.sh +++ b/ops/scripts/tag-bedrock-go-modules.sh @@ -36,6 +36,9 @@ go get github.com/ethereum-optimism/optimism/op-service@$VERSION go get github.com/ethereum-optimism/optimism/op-chain-ops@$VERSION go mod tidy +echo Please update the version to ${VERSION} in op-node/version/version.go +read -p "Press [Enter] key to continue" + git add . git commit -am 'chore: Upgrade op-node dependencies' git push $BEDROCK_TAGS_REMOTE @@ -48,6 +51,9 @@ go get github.com/ethereum-optimism/optimism/op-service@$VERSION go get github.com/ethereum-optimism/optimism/op-node@$VERSION go mod tidy +echo Please update the version to ${VERSION} in op-proposer/cmd/main.go +read -p "Press [Enter] key to continue" + git add . git commit -am 'chore: Upgrade op-proposer dependencies' git push $BEDROCK_TAGS_REMOTE @@ -61,6 +67,9 @@ go get github.com/ethereum-optimism/optimism/op-node@$VERSION go get github.com/ethereum-optimism/optimism/op-proposer@$VERSION go mod tidy +echo Please update the version to ${VERSION} in op-batcher/cmd/main.go +read -p "Press [Enter] key to continue" + git add . git commit -am 'chore: Upgrade op-batcher dependencies' git push $BEDROCK_TAGS_REMOTE