From 893afba952a7d2ee11ff0f9bd0570a7860cee135 Mon Sep 17 00:00:00 2001
From: Liam Horne <liam@lihorne.com>
Date: Wed, 2 Jun 2021 15:34:15 -0400
Subject: [PATCH 1/2] ci: tag docker image for canary with abbreviated
 GITHUB_SHA

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

diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
index 67e53a6b54c9..15c1735b20ca 100644
--- a/.github/workflows/publish-canary.yml
+++ b/.github/workflows/publish-canary.yml
@@ -155,7 +155,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.message-relayer
           push: true
-          tags: ethereumoptimism/message-relayer:${{ needs.builder.outputs.message-relayer }}
+          tags: ethereumoptimism/message-relayer:${{ GITHUB_SHA::6 }}
 
   batch-submitter:
     name: Publish Batch Submitter Version ${{ needs.builder.outputs.batch-submitter }}
@@ -181,7 +181,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.batch-submitter
           push: true
-          tags: ethereumoptimism/batch-submitter:${{ needs.builder.outputs.batch-submitter }}
+          tags: ethereumoptimism/batch-submitter:${{ GITHUB_SHA::6 }}
 
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.builder.outputs.data-transport-layer }}
@@ -207,7 +207,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.data-transport-layer
           push: true
-          tags: ethereumoptimism/data-transport-layer:${{ needs.builder.outputs.data-transport-layer }}
+          tags: ethereumoptimism/data-transport-layer:${{ GITHUB_SHA::6 }}
 
   contracts:
     name: Publish Deployer Version ${{ needs.builder.outputs.contracts }}
@@ -233,7 +233,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.deployer
           push: true
-          tags: ethereumoptimism/deployer:${{ needs.builder.outputs.contracts }}
+          tags: ethereumoptimism/deployer:${{ GITHUB_SHA::6 }}
 
   integration_tests:
     name: Publish Integration tests ${{ needs.builder.outputs.integration-tests }}
@@ -259,4 +259,4 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.integration-tests
           push: true
-          tags: ethereumoptimism/integration-tests:${{ needs.builder.outputs.integration-tests }}
+          tags: ethereumoptimism/integration-tests:${{ GITHUB_SHA::6 }}

From 55b65046e4caa6a211839a7982415a13383507cf Mon Sep 17 00:00:00 2001
From: Liam Horne <liam@lihorne.com>
Date: Wed, 2 Jun 2021 14:40:38 -0700
Subject: [PATCH 2/2] ci: update from 6 bytes to 8 bytes of abbreviation

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

diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
index 15c1735b20ca..5669f25dabd7 100644
--- a/.github/workflows/publish-canary.yml
+++ b/.github/workflows/publish-canary.yml
@@ -155,7 +155,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.message-relayer
           push: true
-          tags: ethereumoptimism/message-relayer:${{ GITHUB_SHA::6 }}
+          tags: ethereumoptimism/message-relayer:${{ GITHUB_SHA::8 }}
 
   batch-submitter:
     name: Publish Batch Submitter Version ${{ needs.builder.outputs.batch-submitter }}
@@ -181,7 +181,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.batch-submitter
           push: true
-          tags: ethereumoptimism/batch-submitter:${{ GITHUB_SHA::6 }}
+          tags: ethereumoptimism/batch-submitter:${{ GITHUB_SHA::8 }}
 
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.builder.outputs.data-transport-layer }}
@@ -207,7 +207,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.data-transport-layer
           push: true
-          tags: ethereumoptimism/data-transport-layer:${{ GITHUB_SHA::6 }}
+          tags: ethereumoptimism/data-transport-layer:${{ GITHUB_SHA::8 }}
 
   contracts:
     name: Publish Deployer Version ${{ needs.builder.outputs.contracts }}
@@ -233,7 +233,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.deployer
           push: true
-          tags: ethereumoptimism/deployer:${{ GITHUB_SHA::6 }}
+          tags: ethereumoptimism/deployer:${{ GITHUB_SHA::8 }}
 
   integration_tests:
     name: Publish Integration tests ${{ needs.builder.outputs.integration-tests }}
@@ -259,4 +259,4 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.integration-tests
           push: true
-          tags: ethereumoptimism/integration-tests:${{ GITHUB_SHA::6 }}
+          tags: ethereumoptimism/integration-tests:${{ GITHUB_SHA::8 }}