Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch publish ci #1267

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Patch publish ci #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2283c8a
Revert "client refactor (#1263)"
ermalkaleci Jun 18, 2024
df9e8f9
revert upload-artifacts to v3
ermalkaleci Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
id: artifact-name
run: echo "::set-output name=name::astar-ubuntu-latest-${TARGET%%-*}"

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.artifact-name.outputs.name }}
path: target/${{ matrix.target }}/release/astar-collator
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- name: Build optimized binary with evm tracing
run: CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="-C codegen-units=1" cargo build --release --target x86_64-unknown-linux-gnu --features evm-tracing --verbose --locked

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: astar-evm-tracing-ubuntu-latest-x86_64-unknown-linux-gnu
path: target/x86_64-unknown-linux-gnu/release/astar-collator
Expand All @@ -142,17 +142,17 @@ jobs:
mv target/x86_64-unknown-linux-gnu/release/wbuild/shiden-runtime/shiden_runtime.compact.compressed.wasm target/x86_64-unknown-linux-gnu/release/wbuild/shiden-runtime/shiden_evm_tracing_runtime.compact.compressed.wasm
mv target/x86_64-unknown-linux-gnu/release/wbuild/shibuya-runtime/shibuya_runtime.compact.compressed.wasm target/x86_64-unknown-linux-gnu/release/wbuild/shibuya-runtime/shibuya_evm_tracing_runtime.compact.compressed.wasm

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: astar-evm-tracing-runtime
path: target/x86_64-unknown-linux-gnu/release/wbuild/astar-runtime/astar_evm_tracing_runtime.compact.compressed.wasm

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: shiden-evm-tracing-runtime
path: target/x86_64-unknown-linux-gnu/release/wbuild/shiden-runtime/shiden_evm_tracing_runtime.compact.compressed.wasm

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: shibuya-evm-tracing-runtime
path: target/x86_64-unknown-linux-gnu/release/wbuild/shibuya-runtime/shibuya_evm_tracing_runtime.compact.compressed.wasm
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
- name: Show sccache stats
run: sccache --show-stats

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: astar-macOS-latest-x86_64
path: target/release/astar-collator
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
tag-sha: true # add git short SHA as Docker tag

- name: Download pre-built linux collator binary
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: astar-ubuntu-latest-x86_64

Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:

# it takes a while to build the runtime, so let's save the artifact as soon as we have it
- name: Archive Artifacts for ${{ matrix.chain }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.chain }}-runtime
path: |
Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
tee ${{ matrix.chain }}-diff.txt

- name: Archive Subwasm results
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.chain }}-runtime
path: |
Expand All @@ -332,19 +332,19 @@ jobs:
fetch-depth: 0

- name: Download astar runtime
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: astar-runtime
path: runtime-artifacts

- name: Download shiden runtime
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: shiden-runtime
path: runtime-artifacts

- name: Download shibuya runtime
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: shibuya-runtime
path: runtime-artifacts
Expand Down Expand Up @@ -398,7 +398,7 @@ jobs:
mkdir -p ubuntu-tracing-bin

- name: Download pre-built collator binary
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: astar-${{ matrix.os }}-latest-${{ matrix.arch }}
path: ${{ matrix.os }}-${{ matrix.arch }}-bin
Expand Down Expand Up @@ -427,7 +427,7 @@ jobs:
chain: ["astar", "shiden", "shibuya"]
steps:
- name: Download runtime
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: ${{ matrix.chain }}-runtime

Expand Down Expand Up @@ -491,25 +491,25 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download pre-built collator binary for evm tracing
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: astar-evm-tracing-ubuntu-latest-x86_64-unknown-linux-gnu
path: evm-tracing-artifacts

- name: Download evm tracing runtime
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: astar-evm-tracing-runtime
path: evm-tracing-artifacts

- name: Download evm tracing runtime
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: shiden-evm-tracing-runtime
path: evm-tracing-artifacts

- name: Download evm tracing runtime
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: shibuya-evm-tracing-runtime
path: evm-tracing-artifacts
Expand Down Expand Up @@ -548,7 +548,7 @@ jobs:
uses: actions/checkout@v4

- name: Download pre-built collator binary
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: astar-ubuntu-latest-x86_64
path: target/release
Expand Down
2 changes: 0 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,6 @@ cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkado
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
Expand Down
2 changes: 0 additions & 2 deletions bin/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,8 @@ sc-cli = { workspace = true, optional = true }

# cumulus dependencies
cumulus-client-cli = { workspace = true }
cumulus-client-collator = { workspace = true }
cumulus-client-consensus-aura = { workspace = true }
cumulus-client-consensus-common = { workspace = true }
cumulus-client-consensus-proposer = { workspace = true }
cumulus-client-consensus-relay-chain = { workspace = true }
cumulus-client-network = { workspace = true }
cumulus-client-service = { workspace = true }
Expand Down
28 changes: 17 additions & 11 deletions bin/collator/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub fn run() -> Result<()> {
..
} = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
Ok((cmd.run(client, import_queue), task_manager))
})
Expand Down Expand Up @@ -261,7 +261,7 @@ pub fn run() -> Result<()> {
..
} = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
Ok((cmd.run(client, config.database), task_manager))
})
Expand Down Expand Up @@ -301,7 +301,7 @@ pub fn run() -> Result<()> {
..
} = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
Ok((cmd.run(client, config.chain_spec), task_manager))
})
Expand Down Expand Up @@ -343,7 +343,7 @@ pub fn run() -> Result<()> {
..
} = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
Ok((cmd.run(client, import_queue), task_manager))
})
Expand Down Expand Up @@ -409,7 +409,7 @@ pub fn run() -> Result<()> {
..
} = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
let aux_revert = Box::new(|client, _, blocks| {
sc_consensus_grandpa::revert(client, blocks)?;
Expand Down Expand Up @@ -452,7 +452,7 @@ pub fn run() -> Result<()> {
let PartialComponents { client, .. } =
parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
cmd.run(config.chain_spec.as_ref(), client.as_ref())
})
Expand Down Expand Up @@ -522,7 +522,7 @@ pub fn run() -> Result<()> {
let params =
parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
cmd.run(params.client)
})
Expand Down Expand Up @@ -562,7 +562,7 @@ pub fn run() -> Result<()> {
let params =
parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
let db = params.backend.expose_db();
let storage = params.backend.expose_storage();
Expand Down Expand Up @@ -618,7 +618,7 @@ pub fn run() -> Result<()> {
let params =
parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;

let ext_builder = RemarkBuilder::new(params.client.clone());
Expand Down Expand Up @@ -700,7 +700,7 @@ pub fn run() -> Result<()> {
let params =
parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
&config,
parachain::build_import_queue_fallback,
parachain::build_import_queue,
)?;
let remark_builder = RemarkBuilder::new(params.client.clone());
let tka_builder = TransferKeepAliveBuilder::new(
Expand Down Expand Up @@ -788,8 +788,14 @@ pub fn run() -> Result<()> {
};

runner.run_node_until_exit(|config| async move {
#[cfg(feature = "evm-tracing")]
if config.chain_spec.is_dev() {
return local::start_node(config, evm_tracing_config).map_err(Into::into);
}

#[cfg(not(feature = "evm-tracing"))]
if config.chain_spec.is_dev() {
return local::start_node(config, #[cfg(feature = "evm-tracing")] evm_tracing_config).map_err(Into::into);
return local::start_node(config).map_err(Into::into);
}

let polkadot_cli = RelayChainCli::new(
Expand Down
Loading
Loading