Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into companion-substra…
Browse files Browse the repository at this point in the history
…te-11940

# Conflicts:
#	client/relay-chain-inprocess-interface/Cargo.toml
#	test/service/Cargo.toml
#	test/service/src/lib.rs
  • Loading branch information
nazar-pc committed Aug 9, 2022
2 parents bccd151 + ed57c8a commit b57ae3e
Show file tree
Hide file tree
Showing 64 changed files with 2,362 additions and 862 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-02_create-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
with:
name: release-notes-context
path: |
context.json
cumulus/scripts/ci/changelog/context.json
- name: Create draft release
id: create-release
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ polkadot_argument_parsing
*.iml
.env
bin
**/._*
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ benchmarks-build:
<<: *benchmarks-manual-refs
script:
- time cargo build --profile production --locked --features runtime-benchmarks
- mkdir artifacts
- mkdir -p artifacts
- cp target/production/polkadot-parachain ./artifacts/

benchmarks:
Expand Down
Loading

0 comments on commit b57ae3e

Please sign in to comment.