Skip to content

Commit

Permalink
Merge pull request #54 from CherryNetwork/mainnet-upgrade-to-v0.9.36
Browse files Browse the repository at this point in the history
Mainnet upgrade to v0.9.36
  • Loading branch information
zycon91 authored Dec 9, 2023
2 parents ff8abc1 + 04d34de commit 28ad51c
Show file tree
Hide file tree
Showing 96 changed files with 3,755 additions and 3,683 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-wasm-runtime.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- cherry
- cherry-testnet

jobs:
build_wasm:
Expand Down
14 changes: 12 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ default:
# they will be used if the job fails
.pipeline-stopper-vars:
before_script:
- !reference [.job-switcher, before_script]
- echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
Expand All @@ -78,18 +79,27 @@ default:
reports:
dotenv: pipeline-stopper.env

.job-switcher:
before_script:
- if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi

.kubernetes-env:
image: "${CI_IMAGE}"
before_script:
- !reference [.job-switcher, before_script]
tags:
- kubernetes-parity-build

.docker-env:
image: "${CI_IMAGE}"
before_script:
- !reference [.job-switcher, before_script]
tags:
- linux-docker
- linux-docker-vm-c2

.compiler-info:
before_script:
- !reference [.job-switcher, before_script]
- rustup show
- cargo --version

Expand Down Expand Up @@ -144,6 +154,7 @@ default:

.build-push-image:
before_script:
- !reference [.job-switcher, before_script]
- test -s ./artifacts/VERSION || exit 1
- test -s ./artifacts/EXTRATAG || exit 1
- VERSION="$(cat ./artifacts/VERSION)"
Expand Down Expand Up @@ -230,7 +241,6 @@ remove-cancel-pipeline-message:
PR_NUM: "${CI_COMMIT_REF_NAME}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
branch: "as-improve"

cancel-pipeline-test-linux-stable:
extends: .cancel-pipeline-template
Expand Down
Loading

0 comments on commit 28ad51c

Please sign in to comment.