Skip to content

Commit

Permalink
ci: Remove ci-builder from changesets
Browse files Browse the repository at this point in the history
`ci-builder` no longer uses changesets for releases. It is now built + published using CCI like our other Go packages are. This PR removes `ci-builder` from changesets, and migrates the CCI config to use the version on Google Artifact Registry.
  • Loading branch information
mslipper committed Apr 18, 2023
1 parent d460e76 commit 6aa0f7f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 51 deletions.
32 changes: 16 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ commands:
jobs:
yarn-monorepo:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
resource_class: large
steps:
- checkout
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:
contracts-bedrock-tests:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
resource_class: large
steps:
- checkout
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:

contracts-bedrock-checks:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
steps:
- checkout
- attach_workspace: { at: "." }
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
contracts-bedrock-slither:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
resource_class: large
steps:
- checkout
Expand All @@ -398,7 +398,7 @@ jobs:

contracts-bedrock-validate-spaces:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
steps:
- checkout
- attach_workspace: { at: "." }
Expand All @@ -415,7 +415,7 @@ jobs:

bedrock-echidna-build:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
steps:
- checkout
- attach_workspace: { at: "." }
Expand All @@ -433,7 +433,7 @@ jobs:

bedrock-echidna-run:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
parameters:
echidna_target:
description: Which echidna fuzz contract to run
Expand All @@ -460,7 +460,7 @@ jobs:

op-bindings-build:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
resource_class: medium
steps:
- checkout
Expand Down Expand Up @@ -489,7 +489,7 @@ jobs:
description: Coverage flag name
type: string
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
resource_class: large
steps:
- checkout
Expand Down Expand Up @@ -535,7 +535,7 @@ jobs:
fuzz-op-node:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
steps:
- checkout
- check-changed:
Expand All @@ -547,7 +547,7 @@ jobs:

depcheck:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
steps:
- checkout
- attach_workspace: { at: "." }
Expand Down Expand Up @@ -609,7 +609,7 @@ jobs:
description: Go Module Name
type: string
docker:
- image: ethereumoptimism/ci-builder:latest # only used to enable codecov.
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest # only used to enable codecov.
resource_class: xlarge
steps:
- checkout
Expand Down Expand Up @@ -637,7 +637,7 @@ jobs:
description: If the op-e2e package should use HTTP clients
type: string
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
resource_class: xlarge
steps:
- checkout
Expand Down Expand Up @@ -676,7 +676,7 @@ jobs:
type: string
default: this-package-does-not-exist
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
- image: cimg/postgres:14.1
steps:
- checkout
Expand Down Expand Up @@ -705,7 +705,7 @@ jobs:

geth-tests:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
steps:
- checkout
- check-changed:
Expand Down Expand Up @@ -925,7 +925,7 @@ jobs:

go-mod-tidy:
docker:
- image: ethereumoptimism/ci-builder:latest
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
steps:
- checkout
- run:
Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
op-exporter: ${{ steps.packages.outputs.op-exporter }}
l2geth-exporter: ${{ steps.packages.outputs.l2geth-exporter }}
batch-submitter-service: ${{ steps.packages.outputs.batch-submitter-service }}
ci-builder: ${{ steps.packages.outputs.ci-builder }}
foundry: ${{ steps.packages.outputs.foundry }}
endpoint-monitor: ${{ steps.packages.outputs.endpoint-monitor }}

Expand Down Expand Up @@ -159,32 +158,6 @@ jobs:
push: true
tags: ethereumoptimism/hardhat-node:${{ needs.release.outputs.hardhat-node }},ethereumoptimism/hardhat-node:latest

ci-builder:
name: Publish ci-builder ${{ needs.release.outputs.ci-builder }}
needs: release
if: needs.release.outputs.ci-builder != ''
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Publish ci-builder
uses: docker/build-push-action@v2
with:
context: ./ops/docker/ci-builder
file: ./ops/docker/ci-builder/Dockerfile
push: true
tags: ethereumoptimism/ci-builder:${{ needs.release.outputs.ci-builder }},ethereumoptimism/ci-builder:latest

foundry:
name: Publish foundry ${{ needs.release.outputs.foundry }}
needs: release
Expand Down
7 changes: 0 additions & 7 deletions ops/docker/ci-builder/package.json

This file was deleted.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"ops/docker/hardhat",
"ops/docker/go-builder",
"ops/docker/js-builder",
"ops/docker/ci-builder",
"ops/docker/foundry",
"endpoint-monitor"
],
Expand Down

0 comments on commit 6aa0f7f

Please sign in to comment.