From a207eb3bc0972e65a2d9bccfa2a647d11cdd873c Mon Sep 17 00:00:00 2001 From: Yin Guanhao Date: Wed, 19 Jul 2023 16:46:15 +0800 Subject: [PATCH] Skip building godwoken-scripts for now --- .github/workflows/docker-publish.yml | 29 ++++++++++++++-------------- Dockerfile.fast | 12 +++++++----- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index faa6972..634b287 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -98,20 +98,21 @@ jobs: working-directory: build/clerkb run: yarn && make all-via-docker - - name: Cache of component.godwoken-scripts - id: godwoken-scripts-cache - uses: actions/cache@v3 - with: - path: | - build/godwoken-scripts/build/release/* - build/godwoken-scripts/c/build/*-generator - build/godwoken-scripts/c/build/*-validator - build/godwoken-scripts/c/build/account_locks/* - key: component.godwoken-scripts-${{ steps.prepare.outputs.godwoken-scripts-sha1 }} - - name: Build godwoken-scripts - if: steps.godwoken-scripts-cache.outputs.cache-hit != 'true' - working-directory: build/godwoken-scripts - run: cd c && make && cd .. && capsule build --release --debug-output + # Skip building godwoken-scripts for now. + # - name: Cache of component.godwoken-scripts + # id: godwoken-scripts-cache + # uses: actions/cache@v3 + # with: + # path: | + # build/godwoken-scripts/build/release/* + # build/godwoken-scripts/c/build/*-generator + # build/godwoken-scripts/c/build/*-validator + # build/godwoken-scripts/c/build/account_locks/* + # key: component.godwoken-scripts-${{ steps.prepare.outputs.godwoken-scripts-sha1 }} + # - name: Build godwoken-scripts + # if: steps.godwoken-scripts-cache.outputs.cache-hit != 'true' + # working-directory: build/godwoken-scripts + # run: cd c && make && cd .. && capsule build --release --debug-output - name: Cache of component.godwoken-polyjuice id: godwoken-polyjuice-cache diff --git a/Dockerfile.fast b/Dockerfile.fast index 6f02c42..2490afc 100644 --- a/Dockerfile.fast +++ b/Dockerfile.fast @@ -22,11 +22,13 @@ RUN mkdir -p /ckb && cd /ckb \ COPY build/clerkb/build/debug/poa /scripts/clerkb/ COPY build/clerkb/build/debug/state /scripts/clerkb/ -# /scripts/godwoken-scripts -COPY build/godwoken-scripts/build/release/* /scripts/godwoken-scripts/ -COPY build/godwoken-scripts/c/build/*-generator /scripts/godwoken-scripts/ -COPY build/godwoken-scripts/c/build/*-validator /scripts/godwoken-scripts/ -COPY build/godwoken-scripts/c/build/account_locks/* /scripts/godwoken-scripts/ +# Copy from previous image because godwoken-scripts cannot be built as is. +COPY --from=ghcr.io/nervosnetwork/godwoken-prebuilds:v0.10.7 /scripts/godwoken-scripts /scripts/godwoken-scripts +# # /scripts/godwoken-scripts +# COPY build/godwoken-scripts/build/release/* /scripts/godwoken-scripts/ +# COPY build/godwoken-scripts/c/build/*-generator /scripts/godwoken-scripts/ +# COPY build/godwoken-scripts/c/build/*-validator /scripts/godwoken-scripts/ +# COPY build/godwoken-scripts/c/build/account_locks/* /scripts/godwoken-scripts/ # /scripts/godwoken-polyjuice COPY build/godwoken-polyjuice/build/*generator* /scripts/godwoken-polyjuice/