Skip to content

Commit

Permalink
Merge pull request #3953 from mobilecoinfoundation/nick/merge-6.0
Browse files Browse the repository at this point in the history
nick/merge 6.0
  • Loading branch information
nick-mobilecoin authored Apr 5, 2024
2 parents 6a484ba + eeda29c commit 21d3af4
Show file tree
Hide file tree
Showing 314 changed files with 2,896 additions and 5,603 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml

This file was deleted.

139 changes: 0 additions & 139 deletions .github/actions/check-dependent-rust-repo/action.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/actions/mobilecoin-cache-cargo-package/action.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/actions/mobilecoin-cache-go-binaries/action.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/actions/mobilecoin-cache-rust-binaries/action.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Set up Rust and associated tools
description: Set up Rust and associated tools

inputs:
components:
description: Comma-separated list of the additional components to install, e.g. 'clippy, rustfmt'
default:
default: ''
required: false
default:
description: Set installed toolchain as a default toolchain
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-bindings-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: mobilecoinofficial/gh-actions/checkout@v0
- name: Build and Publish Bindings
env:
MAVEN_USER: ${{ secrets.MAVEN_USER }}
Expand Down
Loading

0 comments on commit 21d3af4

Please sign in to comment.