Skip to content

Commit

Permalink
Merge pull request #702 from helium/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ChewingGlass authored Sep 6, 2024
2 parents 4822cab + 4f11504 commit 237e3d9
Show file tree
Hide file tree
Showing 262 changed files with 17,218 additions and 15,205 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/develop-release-program.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
program-id: ${{ env.PROGRAM_ID }}
buffer-authority: ${{ secrets.DEVNET_MULTISIG_VAULT }}
- name: Squads program upgrade
uses: helium/[email protected].1
uses: helium/[email protected].3
with:
network-url: "https://api.devnet.solana.com"
program-multisig: ${{ secrets.DEVNET_MULTISIG }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-program.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
buffer-authority: ${{ secrets.MULTISIG_VAULT }}

- name: Squads program upgrade
uses: helium/[email protected].1
uses: helium/[email protected].3
with:
network-url: "https://api.mainnet-beta.solana.com"
program-multisig: ${{ secrets.MULTISIG }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
key: cargo-${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
- run: cargo build --locked
- run: cargo fmt -- --check
- run: cargo clippy --all-targets -- -D warnings -A clippy::result_large_err -A clippy::too_many_arguments -A clippy::uninlined-format-args -A ambiguous_glob_reexports

Expand All @@ -48,6 +49,7 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
key: cargo-${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
- run: cargo build --locked
- run: cargo test --lib

build:
Expand Down Expand Up @@ -99,6 +101,7 @@ jobs:
- packages/tokens-to-rent-service
- packages/rewards-oracle-faucet-service
- packages/vsr-metadata-service
- packages/crons
steps:
- uses: actions/checkout@v3
- run: cd $DOCKER_PATH && docker build .
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ accounts
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
!packages/docsite/src/data
packages/helium-vote-service/helium-vote-proxies/
!packages/docsite/src/data
18 changes: 18 additions & 0 deletions Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,24 @@ address = "propFYxqmVcufMhk5esNMrexq2ogHbbC2kP9PU1qxKs" # Proposal
[[test.validator.clone]]
address = "66t3XARU6Ja3zj91gDZ2KoNLJHEMTYPSKqJWYb6PJJBA" # Proposal IDL

[[test.validator.clone]]
address = "nprx42sXf5rpVnwBWEdRg1d8tuCWsTuVLys1pRWwE6p" # NFT Proxy

[[test.validator.clone]]
address = "CNjepJnCPddZwd8xGS3M2QpZuCbfVRNvi3jfBehKHKHw" # NFT Proxy IDL

[[test.validator.clone]]
address = "orgdXvHVLkWgBYerptASkAwkZAE563CJUu717dMNx5f" # Org program

[[test.validator.clone]]
address = "CjVhwk3gdDXB8iUZCUP9M6QaRvoBGkM7FX9qAf6Qm4sG" # Org program IDL

[[test.validator.clone]]
address = "stcfiqW3fwD9QCd8Bqr1NBLrs7dftZHBQe7RiMMA4aM" # State controller program

[[test.validator.clone]]
address = "GPQNABq6s63uqzHRwZN9e2GcxtzG4yLP5AnJer7DkB9E" # State controller IDL

[[test.validator.clone]]
address = "DQ4C1tzvu28cwo1roN1Wm6TW35sfJEjLh517k3ZeWevx" # Mobile price oracle

Expand Down
Loading

0 comments on commit 237e3d9

Please sign in to comment.