From 2378711bb025022426870c737c4dcee9652e81d5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 15 Jun 2021 11:23:44 -0400
Subject: [PATCH 1/2] Version Packages (#1089)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/lazy-toes-teach.md         | 5 -----
 .changeset/selfish-dryers-teach.md    | 5 -----
 .changeset/ten-pumas-perform.md       | 5 -----
 l2geth/CHANGELOG.md                   | 7 +++++++
 l2geth/package.json                   | 2 +-
 packages/batch-submitter/CHANGELOG.md | 6 ++++++
 packages/batch-submitter/package.json | 2 +-
 7 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/lazy-toes-teach.md
 delete mode 100644 .changeset/selfish-dryers-teach.md
 delete mode 100644 .changeset/ten-pumas-perform.md

diff --git a/.changeset/lazy-toes-teach.md b/.changeset/lazy-toes-teach.md
deleted file mode 100644
index 3c482f92504d..000000000000
--- a/.changeset/lazy-toes-teach.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@eth-optimism/l2geth': patch
----
-
-Fixes an off-by-one error that would sometimes break replica syncing when stopping and restarting geth.
diff --git a/.changeset/selfish-dryers-teach.md b/.changeset/selfish-dryers-teach.md
deleted file mode 100644
index 13ce78fb5784..000000000000
--- a/.changeset/selfish-dryers-teach.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@eth-optimism/batch-submitter': patch
----
-
-Add status to generic error log to disambiguate errors
diff --git a/.changeset/ten-pumas-perform.md b/.changeset/ten-pumas-perform.md
deleted file mode 100644
index e40a6484c396..000000000000
--- a/.changeset/ten-pumas-perform.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@eth-optimism/l2geth': patch
----
-
-Correctly log 'end of OVM execution' message.
diff --git a/l2geth/CHANGELOG.md b/l2geth/CHANGELOG.md
index d0a0f3a73c23..95f2630fce25 100644
--- a/l2geth/CHANGELOG.md
+++ b/l2geth/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.9
+
+### Patch Changes
+
+- f409ce75: Fixes an off-by-one error that would sometimes break replica syncing when stopping and restarting geth.
+- d9fd67d2: Correctly log 'end of OVM execution' message.
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/l2geth/package.json b/l2geth/package.json
index 56a9a6a93700..424e231e21df 100644
--- a/l2geth/package.json
+++ b/l2geth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eth-optimism/l2geth",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "private": true,
   "devDependencies": {}
 }
diff --git a/packages/batch-submitter/CHANGELOG.md b/packages/batch-submitter/CHANGELOG.md
index 6b0e1457b7fb..74311a997ba9 100644
--- a/packages/batch-submitter/CHANGELOG.md
+++ b/packages/batch-submitter/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.5
+
+### Patch Changes
+
+- 7cce55a9: Add status to generic error log to disambiguate errors
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/packages/batch-submitter/package.json b/packages/batch-submitter/package.json
index 102b8c8f6773..835646c19097 100644
--- a/packages/batch-submitter/package.json
+++ b/packages/batch-submitter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eth-optimism/batch-submitter",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "private": true,
   "description": "[Optimism] Batch submission for sequencer & aggregators",
   "main": "dist/index",

From 14243701923f521bfd16ea0ce94f60a84e72900f Mon Sep 17 00:00:00 2001
From: Liam Horne <liam@lihorne.com>
Date: Tue, 15 Jun 2021 11:57:22 -0400
Subject: [PATCH 2/2] fix: use -z flag for var unset in canary

---
 .github/workflows/publish-canary.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
index d5cb35ddb93f..82585ff8dc8e 100644
--- a/.github/workflows/publish-canary.yml
+++ b/.github/workflows/publish-canary.yml
@@ -74,11 +74,11 @@ jobs:
       - name: Docker Image Name
         id: docker_image_name
         run: |
-          if [ $CUSTOM_IMAGE_NAME == '' ]
+          if [ -z "${CUSTOM_IMAGE_NAME}" ]
           then
               echo "::set-output name=canary-docker-tag::${GITHUB_SHA::8}"
           else
-              echo "::set-output name=canary-docker-tag::prerelease-$CUSTOM_IMAGE_NAME"
+              echo "::set-output name=canary-docker-tag::prerelease-${CUSTOM_IMAGE_NAME}"
           fi
         env:
           CUSTOM_IMAGE_NAME: ${{ github.event.inputs.customImageName }}
@@ -112,7 +112,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.geth
           push: true
-          tags: ethereumoptimism/l2geth:${{ needs.canary-publish.outputs.l2geth }}
+          tags: ethereumoptimism/l2geth:${{ steps.docker_image_name.outputs.canary-docker-tag }}
 
   # pushes the base builder image to dockerhub
   builder: