Skip to content

Commit

Permalink
merge in master
Browse files Browse the repository at this point in the history
  • Loading branch information
Riateche authored and NourAlharithi committed Dec 18, 2024
1 parent a6840e1 commit a4e1548
Show file tree
Hide file tree
Showing 6 changed files with 3,144 additions and 6,783 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/ci-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,24 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
<<<<<<< HEAD:.github/workflows/ci-typescript.yml
node-version: 18
=======
node-version-file: "package.json"
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.81.0
- name: Install Solana Cli
run: |
sh -c "$(curl -sSfL https://release.anza.xyz/stable/install)"
echo "$HOME/.local/share/solana/install/active_release/bin" >> "$GITHUB_PATH"
- name: Set Solana Cli version
run: agave-install init 1.18.26
- name: Create Solana key
run: solana-keygen new --no-bip39-passphrase
- name: Install Anchor
run: RUSTFLAGS= cargo install --git https://github.com/coral-xyz/anchor --tag v0.30.1 anchor-cli
>>>>>>> 44d691a9 (chore: add missing package name and remove lock files (#2128)):.github/workflows/ci-turbo-test.yml
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
Expand Down
1 change: 1 addition & 0 deletions lazer/contracts/solana/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "@pythnetwork/pyth-lazer-solana-contract",
"license": "ISC",
"scripts": {
"fix:format": "prettier --write **/*.*",
Expand Down
Loading

0 comments on commit a4e1548

Please sign in to comment.