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.

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

ci/test-ledger-app: undo previous changes and run on ubuntu image (backport #4160) #4165

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2024

Describe your changes

Checklist before merging

  • If this PR has some consensus breaking changes, I added the corresponding breaking:: labels
    • This will require 2 reviewers to approve the changes
  • If this PR requires changes to the docs or specs, a corresponding PR is opened in the namada-docs repo
    • Relevant PR if applies:
  • If this PR affects services such as namada-indexer or namada-masp-indexer, a corresponding PR is opened in that repo
    • Relevant PR if applies:

This is an automatic backport of pull request #4160 done by [Mergify](https://mergify.com).

This reverts commit 0cb4915.

(cherry picked from commit b2e33f9)

# Conflicts:
#	.github/workflows/ci.yml
This reverts commit 3291544.

(cherry picked from commit 69fbdf8)
This reverts commit 41ef454.

(cherry picked from commit 52d0ebb)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/scripts/hermes.txt
#	CHANGELOG.md
#	Cargo.lock
#	Cargo.toml
#	README.md
#	crates/apps/Cargo.toml
#	crates/apps_lib/src/cli.rs
#	crates/apps_lib/src/cli/client.rs
#	crates/apps_lib/src/cli/context.rs
#	crates/apps_lib/src/cli/wallet.rs
#	crates/apps_lib/src/client/tx.rs
#	crates/apps_lib/src/config/genesis/transactions.rs
#	crates/apps_lib/src/config/genesis/utils.rs
#	crates/apps_lib/src/wallet/defaults.rs
#	crates/benches/native_vps.rs
#	crates/core/src/masp.rs
#	crates/ibc/src/lib.rs
#	crates/node/src/bench_utils.rs
#	crates/node/src/shell/testing/client.rs
#	crates/sdk/src/args.rs
#	crates/sdk/src/lib.rs
#	crates/sdk/src/signing.rs
#	crates/sdk/src/tx.rs
#	crates/shielded_token/src/masp.rs
#	crates/shielded_token/src/masp/shielded_wallet.rs
#	crates/shielded_token/src/validation.rs
#	crates/tests/src/e2e/helpers.rs
#	crates/tests/src/e2e/ibc_tests.rs
#	crates/tests/src/e2e/ledger_tests.rs
#	crates/tests/src/e2e/setup.rs
#	crates/tests/src/integration/helpers.rs
#	crates/tests/src/integration/ledger_tests.rs
#	crates/tests/src/integration/masp.rs
#	crates/token/src/lib.rs
#	crates/tx/src/types.rs
#	crates/wallet/src/keys.rs
#	crates/wallet/src/lib.rs
#	crates/wallet/src/store.rs
#	genesis/hardware/src/pre-genesis/wallet.toml
#	genesis/localnet/balances.toml
#	genesis/localnet/src/pre-genesis/signed-transactions.toml
#	genesis/localnet/src/pre-genesis/unsigned-transactions.toml
#	genesis/localnet/src/pre-genesis/wallet.toml
#	genesis/localnet/transactions.toml
#	wasm/Cargo.lock
#	wasm_for_tests/Cargo.lock
@mergify mergify bot added the conflicts label Dec 11, 2024
Copy link
Contributor Author

mergify bot commented Dec 11, 2024

Cherry-pick of b2e33f9 has failed:

On branch mergify/bp/maint-libs-0.46/pr-4160
Your branch is up to date with 'origin/maint-libs-0.46'.

You are currently cherry-picking commit b2e33f943.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 52d0ebb has failed:

On branch mergify/bp/maint-libs-0.46/pr-4160
Your branch is ahead of 'origin/maint-libs-0.46' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 52d0ebbd7c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changelog/unreleased/CI/4140-ledger-namada-unit-tests-ci.md
	new file:   .changelog/unreleased/SDK/4127-masp-for-namadillo.md
	new file:   .changelog/v1.0.0/miscellaneous/4123-apps-pre-release.md
	new file:   .changelog/v1.0.0/summary.md
	new file:   genesis/localnet/src/pre-genesis/established/established-account-tx-frank.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      .github/workflows/ci.yml
	both added:      .github/workflows/scripts/hermes.txt
	both added:      CHANGELOG.md
	both added:      Cargo.lock
	both added:      Cargo.toml
	both added:      README.md
	both added:      crates/apps/Cargo.toml
	both added:      crates/apps_lib/src/cli.rs
	both added:      crates/apps_lib/src/cli/client.rs
	both added:      crates/apps_lib/src/cli/context.rs
	both added:      crates/apps_lib/src/cli/wallet.rs
	both added:      crates/apps_lib/src/client/tx.rs
	both added:      crates/apps_lib/src/config/genesis/transactions.rs
	both added:      crates/apps_lib/src/config/genesis/utils.rs
	both added:      crates/apps_lib/src/wallet/defaults.rs
	both added:      crates/benches/native_vps.rs
	both added:      crates/core/src/masp.rs
	both added:      crates/ibc/src/lib.rs
	both added:      crates/node/src/bench_utils.rs
	both added:      crates/node/src/shell/testing/client.rs
	both added:      crates/sdk/src/args.rs
	both added:      crates/sdk/src/lib.rs
	both added:      crates/sdk/src/signing.rs
	both added:      crates/sdk/src/tx.rs
	both added:      crates/shielded_token/src/masp.rs
	both added:      crates/shielded_token/src/masp/shielded_wallet.rs
	both added:      crates/shielded_token/src/validation.rs
	both added:      crates/tests/src/e2e/helpers.rs
	both added:      crates/tests/src/e2e/ibc_tests.rs
	both added:      crates/tests/src/e2e/ledger_tests.rs
	both added:      crates/tests/src/e2e/setup.rs
	both added:      crates/tests/src/integration/helpers.rs
	both added:      crates/tests/src/integration/ledger_tests.rs
	both added:      crates/tests/src/integration/masp.rs
	both added:      crates/token/src/lib.rs
	both added:      crates/tx/src/types.rs
	both added:      crates/wallet/src/keys.rs
	both added:      crates/wallet/src/lib.rs
	both added:      crates/wallet/src/store.rs
	both added:      genesis/hardware/src/pre-genesis/wallet.toml
	both added:      genesis/localnet/balances.toml
	both added:      genesis/localnet/src/pre-genesis/signed-transactions.toml
	both added:      genesis/localnet/src/pre-genesis/unsigned-transactions.toml
	both added:      genesis/localnet/src/pre-genesis/wallet.toml
	both added:      genesis/localnet/transactions.toml
	both added:      wasm/Cargo.lock
	both added:      wasm_for_tests/Cargo.lock

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@tzemanovic tzemanovic closed this Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant