소스 검색

Tiltfile: replace shell scripts by direct commands

This removes all locally ran shell scripts, which should hopefully
enable the Tiltfile to run without changes on Windows.

We lose the invariant of clearing the output directories, which
seems like a reasonable sacrifice for banishing bash.

Change-Id: I756928a25cada1b613ed9fda145809a414a46466
Leo 4 년 전
부모
커밋
4f0759b8f2
5개의 변경된 파일23개의 추가작업 그리고 30개의 파일을 삭제
  1. 23 7
      Tiltfile
  2. 0 5
      generate-protos-web.sh
  3. 0 8
      generate-protos.sh
  4. 0 8
      generate-wasm.sh
  5. 0 2
      jenkins-presubmit.groovy

+ 23 - 7
Tiltfile

@@ -51,14 +51,26 @@ proto_deps = ["./proto", "./generate-protos.sh", "buf.yaml", "buf.gen.yaml"]
 local_resource(
     name = "proto-gen",
     deps = proto_deps,
-    cmd = "./generate-protos.sh",
+    cmd = "tilt docker build -- --target go-export -f Dockerfile.proto -o type=local,dest=node .",
+    env = {"DOCKER_BUILDKIT": "1"},
 )
 
 local_resource(
     name = "proto-gen-web",
     deps = proto_deps,
     resource_deps = ["proto-gen"],
-    cmd = "./generate-protos-web.sh",
+    cmd = "tilt docker build -- --target node-export -f Dockerfile.proto -o type=local,dest=. .",
+    env = {"DOCKER_BUILDKIT": "1"},
+)
+
+# wasm
+
+local_resource(
+    name = "wasm-gen",
+    deps = ["solana"],
+    dir = "solana",
+    cmd = "tilt docker build -- -f Dockerfile.wasm -o type=local,dest=.. .",
+    env = {"DOCKER_BUILDKIT": "1"},
 )
 
 # bridge
@@ -145,11 +157,15 @@ docker_build(
 
 k8s_yaml_with_ns("devnet/solana-devnet.yaml")
 
-k8s_resource("solana-devnet", port_forwards = [
-    port_forward(8899, name = "Solana RPC [:8899]"),
-    port_forward(8900, name = "Solana WS [:8900]"),
-    port_forward(9000, name = "Solana PubSub [:9000]"),
-])
+k8s_resource(
+    "solana-devnet",
+    resource_deps = ["wasm-gen"],
+    port_forwards = [
+        port_forward(8899, name = "Solana RPC [:8899]"),
+        port_forward(8900, name = "Solana WS [:8900]"),
+        port_forward(9000, name = "Solana PubSub [:9000]"),
+    ],
+)
 
 # eth devnet
 

+ 0 - 5
generate-protos-web.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-rm -rf explorer/src/proto sdk/js/src/proto
-
-DOCKER_BUILDKIT=1 tilt docker build -- --target node-export -f Dockerfile.proto -o type=local,dest=. .

+ 0 - 8
generate-protos.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# TODO(leo): remove after a while
-rm -rf bridge
-
-rm -rf node/pkg/proto
-DOCKER_BUILDKIT=1 tilt docker build -- --target go-export -f Dockerfile.proto -o type=local,dest=node .

+ 0 - 8
generate-wasm.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Regenerate sdk/js/src/solana
-set -euo pipefail
-
-(
-  cd solana
-  DOCKER_BUILDKIT=1 tilt docker build -- -f Dockerfile.wasm -o type=local,dest=.. .
-)

+ 0 - 2
jenkins-presubmit.groovy

@@ -25,8 +25,6 @@ pipeline {
 
                         sh kubeCleanup
 
-                        sh "./generate-wasm.sh"
-
                         timeout(time: 60, unit: 'MINUTES') {
                             sh "tilt ci -- --ci --namespace=$DEPLOY_NS --num=1"
                         }