From 4096a06deb3cc9024278e33ee788145259ff9d57 Mon Sep 17 00:00:00 2001 From: Flouse <1297478+Flouse@users.noreply.github.com> Date: Thu, 12 Oct 2023 09:07:30 +0000 Subject: [PATCH] Build Godwoken 0.11.0 https://github.com/godwokenrises/godwoken/tree/v0.11.0 --- .github/workflows/docker-publish.yml | 31 ++++++++++++++-------------- Dockerfile.fast | 16 +++++++------- Makefile | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 56accf1..458a1f7 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -5,9 +5,9 @@ on: # schedule: # - cron: '22 3 * * *' push: - branches: [ main, 'v0.10*', '0.10*' ] + branches: [ main, 'v0.11*', '0.11*' ] # Publish semver tags as releases. - tags: [ 'v*.*.*', '0.10.*', '1.*' ] + tags: [ 'v*.*.*', '0.11.*', '1.*' ] env: # Use docker.io for Docker Hub if empty @@ -98,7 +98,7 @@ jobs: working-directory: build/clerkb run: yarn && make all-via-docker - # Skip building godwoken-scripts for now. + # Skip building godwoken-scripts because Godwoken v0 is in maintenance mode with no change. # - name: Cache of component.godwoken-scripts # id: godwoken-scripts-cache # uses: actions/cache@v3 @@ -114,18 +114,19 @@ jobs: # 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 - uses: actions/cache@v3 - with: - path: | - build/godwoken-polyjuice/build/*generator* - build/godwoken-polyjuice/build/*validator* - key: component.godwoken-polyjuice-${{ steps.prepare.outputs.godwoken-polyjuice-sha1 }} - - name: Build godwoken-polyjuice - if: steps.godwoken-polyjuice-cache.outputs.cache-hit != 'true' - working-directory: build/godwoken-polyjuice - run: make all-via-docker + # Skip building godwoken-polyjuice because Godwoken v0 is in maintenance mode with no change. + # - name: Cache of component.godwoken-polyjuice + # id: godwoken-polyjuice-cache + # uses: actions/cache@v3 + # with: + # path: | + # build/godwoken-polyjuice/build/*generator* + # build/godwoken-polyjuice/build/*validator* + # key: component.godwoken-polyjuice-${{ steps.prepare.outputs.godwoken-polyjuice-sha1 }} + # - name: Build godwoken-polyjuice + # if: steps.godwoken-polyjuice-cache.outputs.cache-hit != 'true' + # working-directory: build/godwoken-polyjuice + # run: make all-via-docker - name: Cache of component.godwoken id: godwoken-cache diff --git a/Dockerfile.fast b/Dockerfile.fast index 2490afc..42c9735 100644 --- a/Dockerfile.fast +++ b/Dockerfile.fast @@ -12,10 +12,10 @@ RUN apt-get update \ # Install ckb and ckb-cli. RUN mkdir -p /ckb && cd /ckb \ - && curl -LO https://github.com/nervosnetwork/ckb/releases/download/v0.111.0-rc8/ckb_v0.111.0-rc8_x86_64-unknown-linux-gnu-portable.tar.gz \ - && tar xzf ckb_v0.111.0-rc8_x86_64-unknown-linux-gnu-portable.tar.gz \ - && cp ckb_v0.111.0-rc8_x86_64-unknown-linux-gnu-portable/ckb /bin/ \ - && cp ckb_v0.111.0-rc8_x86_64-unknown-linux-gnu-portable/ckb-cli /bin/ \ + && curl -LO https://github.com/nervosnetwork/ckb/releases/download/v0.111.0/ckb_v0.111.0_x86_64-unknown-linux-gnu-portable.tar.gz \ + && tar xzf ckb_v0.111.0_x86_64-unknown-linux-gnu-portable.tar.gz \ + && cp ckb_v0.111.0_x86_64-unknown-linux-gnu-portable/ckb /bin/ \ + && cp ckb_v0.111.0_x86_64-unknown-linux-gnu-portable/ckb-cli /bin/ \ && rm -rf /ckb # /scripts/clerkb @@ -24,15 +24,17 @@ COPY build/clerkb/build/debug/state /scripts/clerkb/ # 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 +# /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-polyjuice /scripts/godwoken-polyjuice # /scripts/godwoken-polyjuice -COPY build/godwoken-polyjuice/build/*generator* /scripts/godwoken-polyjuice/ -COPY build/godwoken-polyjuice/build/*validator* /scripts/godwoken-polyjuice/ +# COPY build/godwoken-polyjuice/build/*generator* /scripts/godwoken-polyjuice/ +# COPY build/godwoken-polyjuice/build/*validator* /scripts/godwoken-polyjuice/ # godwoken COPY build/godwoken/target/release/godwoken /bin/godwoken diff --git a/Makefile b/Makefile index 9836a27..c5476f6 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ POLYJUICE_REPO := https://github.com/nervosnetwork/godwoken-polyjuice.git CLERKB_REPO := https://github.com/nervosnetwork/clerkb.git # components tags -GODWOKEN_REF := refs/pull/1084/merge +GODWOKEN_REF := v0.11.0 # https://github.com/godwokenrises/godwoken/tree/v0.11.0 GODWOKEN_SCRIPTS_REF := v0.9.0 # https://github.com/nervosnetwork/godwoken-scripts/releases/tag/v0.9.0 POLYJUICE_REF := 0.8.14 # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/0.8.14 CLERKB_REF := v0.4.0