Skip to content

Commit

Permalink
Merge pull request #58 from nervosnetwork/1.2.0-rc1
Browse files Browse the repository at this point in the history
Build prebuilds:1.2.0-rc
  • Loading branch information
Flouse committed Jun 13, 2022
2 parents 9d322b2 + 7ad29f8 commit d706fb1
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
# schedule:
# - cron: '22 */12 * * *'
push:
branches: [ 'main', 'dev', 'v1*' ]
branches: [ 'main', 'dev', 'v1*', '1.*' ]
# Publish semver tags as releases.
tags: [ 'v*.*.*' ]
tags: [ 'v*.*.*', '1.*' ]

env:
# Use docker.io for Docker Hub if empty
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
integration-test:
needs: docker-build-push
uses: nervosnetwork/godwoken-tests/.github/workflows/reusable-integration-test-v1.yml@simplify-workflow
uses: nervosnetwork/godwoken-tests/.github/workflows/reusable-integration-test-v1.yml@develop
with:
extra_github_env: |
GODWOKEN_PREBUILD_IMAGE_NAME="${{ needs.docker-build-push.outputs.image_name }}:${{ needs.docker-build-push.outputs.image_tag }}"
30 changes: 30 additions & 0 deletions Dockerfile.fast
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# Some historical versions

# Godwoken testnet_v1 blocks[0..110000] uses polyjuice-v1.1.5-beta
# https://github.com/nervosnetwork/godwoken-docker-prebuilds/pkgs/container/godwoken-prebuilds/23550942?tag=v1.1.4-rc1
# > "ref.component.godwoken-polyjuice": "v1.1.5-beta 2607851"
FROM ghcr.io/nervosnetwork/godwoken-prebuilds:v1.1.4-rc1 as polyjuice-v1.1.5-beta

# https://github.com/nervosnetwork/godwoken-docker-prebuilds/pkgs/container/godwoken-prebuilds/24701212?tag=1.2.0-rc1
# > "ref.component.godwoken-polyjuice": "1.2.0 b1e0622"
FROM ghcr.io/nervosnetwork/godwoken-prebuilds:1.2.0-rc1 as polyjuice-v1.2.0

################################################################################
FROM ubuntu:21.04

RUN mkdir -p /scripts/godwoken-scripts \
Expand Down Expand Up @@ -26,6 +38,7 @@ RUN cd /ckb-indexer \
&& cp /ckb-indexer/ckb-indexer /bin/ckb-indexer \
&& rm -rf /ckb-indexer

#################################### latest ####################################
# /scripts/omni-lock
COPY build/ckb-production-scripts/build/omni_lock /scripts/godwoken-scripts/

Expand All @@ -38,6 +51,23 @@ COPY build/godwoken-scripts/c/build/account_locks/* /scripts/godwoken-scripts/
# /scripts/godwoken-polyjuice
COPY build/godwoken-polyjuice/build/*generator* /scripts/godwoken-polyjuice/
COPY build/godwoken-polyjuice/build/*validator* /scripts/godwoken-polyjuice/
################################################################################

############################## polyjuice-v1.2.0 ################################
# https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.2.0
RUN mkdir -p /scripts/godwoken-polyjuice-v1.2.0

COPY --from=polyjuice-v1.2.0 /scripts/godwoken-polyjuice/* \
/scripts/godwoken-polyjuice-v1.2.0/
################################################################################

############################ polyjuice-v1.1.5-beta #############################
# https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/v1.1.5-beta
RUN mkdir -p /scripts/godwoken-polyjuice-v1.1.5-beta

COPY --from=polyjuice-v1.1.5-beta /scripts/godwoken-polyjuice/* \
/scripts/godwoken-polyjuice-v1.1.5-beta/
################################################################################

# godwoken
COPY build/godwoken/target/release/godwoken /bin/godwoken
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ POLYJUICE_REPO := https://github.com/nervosnetwork/godwoken-polyjuice.git
OMNI_LOCK_REPO := https://github.com/nervosnetwork/ckb-production-scripts.git

# components tags
GODWOKEN_REF := v1.1.4-rc1 # https://github.com/nervosnetwork/godwoken/commits/v1.1.4-rc1
GODWOKEN_REF := v1.2.0-rc1 # https://github.com/nervosnetwork/godwoken/releases/tag/v1.2.0-rc1
GODWOKEN_SCRIPTS_REF := v1.1.0-beta # https://github.com/nervosnetwork/godwoken-scripts/releases/tag/v1.1.0-beta
POLYJUICE_REF := v1.1.5-beta # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/v1.1.5-beta
POLYJUICE_REF := 1.2.0 # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.2.0
OMNI_LOCK_REF := rc_lock

define prepare_repo
Expand Down

0 comments on commit d706fb1

Please sign in to comment.