Merge branch 'develop' into cannon

.circleci/config.yml

@@ -1425,7 +1425,7 @@ workflows:
           type: approval
           filters:
             tags:
-              only: /^(fault-detector|proxyd|indexer|op-[a-z0-9\-]*)\/v.*/
+              only: /^(fault-detector|proxyd|indexer|ci-builder|op-[a-z0-9\-]*)\/v.*/
             branches:
               ignore: /.*/
       - docker-release:
@@ -1554,10 +1554,8 @@ workflows:
             - oplabs-gcr-release
           requires:
             - hold
-  release-ci-builder:
-    jobs:
-      - docker-publish:
-          name: ci-builder-docker-publish
+      - docker-release:
+          name: ci-builder-docker-release
           filters:
             tags:
               only: /^ci-builder\/v.*/
@@ -1569,6 +1567,8 @@ workflows:
           docker_context: ./ops/docker/ci-builder
           context:
             - oplabs-gcr
+          requires:
+            - hold
   scheduled-fpp:
     triggers:
       - schedule:

ops/docker/ci-builder/Dockerfile

@@ -39,7 +39,6 @@ COPY --from=foundry-build /opt/foundry/target/release/cast /usr/local/bin/cast
 COPY --from=foundry-build /opt/foundry/target/release/anvil /usr/local/bin/anvil
 COPY --from=geth /usr/local/bin/abigen /usr/local/bin/abigen
 COPY --from=echidna-test /usr/local/bin/echidna-test /usr/local/bin/echidna-test
-COPY check-changed.sh /usr/local/bin/check-changed
 
 RUN apt-get update && \
   apt-get install -y bash curl openssh-client git build-essential ca-certificates jq musl gnupg coreutils && \