Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix canary publishing #1093

Merged
merged 5 commits into from
Jun 15, 2021
Merged

Fix canary publishing #1093

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75b9128
ci: fix custom docker tag
snario Jun 15, 2021
7e46144
ci: use new env file
snario Jun 15, 2021
eb86c31
ci: use outputs from previous job
snario Jun 15, 2021
0af6540
ci: fix headers of jobs
snario Jun 15, 2021
a3e2087
ci: inherit canary tag from builder
snario Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions .github/workflows/publish-canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
message-relayer: ${{ steps.packages.outputs.message-relayer }}
data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
contracts: ${{ steps.packages.outputs.contracts }}
canary-docker-tag: ${{ steps.docker-image-name.outputs.canary-docker-tag }}

steps:
- name: Check out source code
Expand Down Expand Up @@ -72,9 +73,9 @@ jobs:
node ops/scripts/ci-versions.js ${{ toJSON(steps.changesets.outputs.publishedPackages) }}

- name: Docker Image Name
id: docker_image_name
id: docker-image-name
run: |
if [ -z "${CUSTOM_IMAGE_NAME}" ]
if [ ${CUSTOM_IMAGE_NAME} == '' ]
then
echo "::set-output name=canary-docker-tag::${GITHUB_SHA::8}"
else
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One nit is that having the prerelease as a prefix breaks semantic versioning, see https://semver.org/#spec-item-9

Expand All @@ -89,7 +90,7 @@ jobs:
# while also allowing for parallelization (i.e. `l2geth` not depending on `builder`)
# and all jobs executing in parallel once `builder` is built
l2geth:
name: Publish L2Geth Version ${{ needs.canary-publish.outputs.l2geth }}
name: Publish L2Geth Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
needs: canary-publish
if: needs.canary-publish.outputs.l2geth != ''
runs-on: ubuntu-latest
Expand All @@ -112,7 +113,7 @@ jobs:
context: .
file: ./ops/docker/Dockerfile.geth
push: true
tags: ethereumoptimism/l2geth:${{ steps.docker_image_name.outputs.canary-docker-tag }}
tags: ethereumoptimism/l2geth:${{ needs.canary-publish.outputs.canary-docker-tag }}

# pushes the base builder image to dockerhub
builder:
Expand All @@ -127,6 +128,8 @@ jobs:
data-transport-layer: ${{ needs.canary-publish.outputs.data-transport-layer }}
contracts: ${{ needs.canary-publish.outputs.contracts }}
integration-tests: ${{ needs.canary-publish.outputs.integration-tests }}
canary-docker-tag: ${{ needs.canary-publish.outputs.canary-docker-tag }}


steps:
- name: Checkout
Expand All @@ -149,7 +152,7 @@ jobs:
tags: ethereumoptimism/builder

message-relayer:
name: Publish Message Relayer Version ${{ needs.builder.outputs.message-relayer }}
name: Publish Message Relayer Version ${{ needs.builder.outputs.canary-docker-tag }}
needs: builder
if: needs.builder.outputs.message-relayer != ''
runs-on: ubuntu-latest
Expand All @@ -172,10 +175,10 @@ jobs:
context: .
file: ./ops/docker/Dockerfile.message-relayer
push: true
tags: ethereumoptimism/message-relayer:${{ steps.docker_image_name.outputs.canary-docker-tag }}
tags: ethereumoptimism/message-relayer:${{ needs.builder.outputs.canary-docker-tag }}

batch-submitter:
name: Publish Batch Submitter Version ${{ needs.builder.outputs.batch-submitter }}
name: Publish Batch Submitter Version ${{ needs.builder.outputs.canary-docker-tag }}
needs: builder
if: needs.builder.outputs.batch-submitter != ''
runs-on: ubuntu-latest
Expand All @@ -198,10 +201,10 @@ jobs:
context: .
file: ./ops/docker/Dockerfile.batch-submitter
push: true
tags: ethereumoptimism/batch-submitter:${{ steps.docker_image_name.outputs.canary-docker-tag }}
tags: ethereumoptimism/batch-submitter:${{ needs.builder.outputs.canary-docker-tag }}

data-transport-layer:
name: Publish Data Transport Layer Version ${{ needs.builder.outputs.data-transport-layer }}
name: Publish Data Transport Layer Version ${{ needs.builder.outputs.canary-docker-tag }}
needs: builder
if: needs.builder.outputs.data-transport-layer != ''
runs-on: ubuntu-latest
Expand All @@ -224,10 +227,10 @@ jobs:
context: .
file: ./ops/docker/Dockerfile.data-transport-layer
push: true
tags: ethereumoptimism/data-transport-layer:${{ steps.docker_image_name.outputs.canary-docker-tag }}
tags: ethereumoptimism/data-transport-layer:${{ needs.builder.outputs.canary-docker-tag }}

contracts:
name: Publish Deployer Version ${{ needs.builder.outputs.contracts }}
name: Publish Deployer Version ${{ needs.builder.outputs.canary-docker-tag }}
needs: builder
if: needs.builder.outputs.contracts != ''
runs-on: ubuntu-latest
Expand All @@ -250,7 +253,7 @@ jobs:
context: .
file: ./ops/docker/Dockerfile.deployer
push: true
tags: ethereumoptimism/deployer:${{ steps.docker_image_name.outputs.canary-docker-tag }}
tags: ethereumoptimism/deployer:${{ needs.builder.outputs.canary-docker-tag }}

integration_tests:
name: Publish Integration tests ${{ needs.builder.outputs.integration-tests }}
Expand All @@ -276,4 +279,4 @@ jobs:
context: .
file: ./ops/docker/Dockerfile.integration-tests
push: true
tags: ethereumoptimism/integration-tests:${{ steps.docker_image_name.outputs.canary-docker-tag }}
tags: ethereumoptimism/integration-tests:${{ needs.builder.outputs.canary-docker-tag }}