Skip to content

Commit

Permalink
fix: actionlint (#692)
Browse files Browse the repository at this point in the history
* switch to photon 0.18

* re-enable js/rpc-interop tests

* Update rpc-interop e2e test commands in js/**/package.json

* wip

* stable

---------

Co-authored-by: Sergey Timoshin <[email protected]>
Co-authored-by: Swen <[email protected]>
  • Loading branch information
3 people authored May 8, 2024
1 parent 5e4cbeb commit 5ab3117
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/light-sdk-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
]'
steps:
- name: Log in to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-macro-circom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
submodules: true

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: actions-rs/toolchain@stable
with:
toolchain: stable
override: true

- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2

- name: Install cross
uses: supplypike/setup-bin@v3
Expand Down Expand Up @@ -69,12 +69,12 @@ jobs:
submodules: true

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: actions-rs/toolchain@stable
with:
toolchain: stable
override: true

- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2

- name: Install Rust aarch64-apple-darwin target
run: |
Expand Down
2 changes: 1 addition & 1 deletion cli/src/utils/initTestEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const execAsync = util.promisify(exec);

const LIGHT_PROTOCOL_PROGRAMS_DIR_ENV = "LIGHT_PROTOCOL_PROGRAMS_DIR";
const BASE_PATH = "../../bin/";
const PHOTON_VERSION = "0.15.0";
const PHOTON_VERSION = "0.18.0";

async function isExpectedPhotonVersion(
requiredVersion: string,
Expand Down
2 changes: 1 addition & 1 deletion js/compressed-token/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"test:e2e:compress": "pnpm test-validator && vitest run tests/e2e/compress.test.ts --reporter=verbose",
"test:e2e:decompress": "pnpm test-validator && vitest run tests/e2e/decompress.test.ts --reporter=verbose",
"test:e2e:rpc-token-interop": "pnpm test-validator && vitest run tests/e2e/rpc-token-interop.test.ts --reporter=verbose",
"test:e2e:all": "pnpm test-validator && vitest run tests/e2e/create-mint.test.ts && vitest run tests/e2e/mint-to.test.ts && vitest run tests/e2e/transfer.test.ts && vitest run tests/e2e/compress.test.ts && vitest run tests/e2e/decompress.test.ts && vitest run tests/e2e/register-mint.test.ts && vitest run tests/e2e/approve-and-mint-to.test.ts",
"test:e2e:all": "pnpm test-validator && vitest run tests/e2e/create-mint.test.ts && vitest run tests/e2e/mint-to.test.ts && vitest run tests/e2e/transfer.test.ts && vitest run tests/e2e/compress.test.ts && vitest run tests/e2e/decompress.test.ts && vitest run tests/e2e/register-mint.test.ts && vitest run tests/e2e/approve-and-mint-to.test.ts && vitest run tests/e2e/rpc-token-interop.test.ts",
"pull-idl": "../../scripts/push-compressed-token-idl.sh",
"build": "rimraf dist && pnpm run pull-idl && pnpm build:bundle",
"build:bundle": "rollup -c",
Expand Down
2 changes: 1 addition & 1 deletion js/stateless.js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"test:e2e:test-rpc": "pnpm test-validator && vitest run tests/e2e/test-rpc.test.ts",
"test:e2e:rpc-interop": "pnpm test-validator && vitest run tests/e2e/rpc-interop.test.ts",
"test:e2e:browser": "pnpm playwright test",
"test:e2e:all": "pnpm test-validator && vitest run tests/e2e/test-rpc.test.ts && vitest run tests/e2e/compress.test.ts && vitest run tests/e2e/transfer.test.ts",
"test:e2e:all": "pnpm test-validator && vitest run tests/e2e/test-rpc.test.ts && vitest run tests/e2e/compress.test.ts && vitest run tests/e2e/transfer.test.ts && vitest run tests/e2e/rpc-interop.test.ts",
"test:index": "vitest run tests/e2e/program.test.ts",
"test:e2e:serde": "vitest run tests/e2e/serde.test.ts",
"test:verbose": "vitest run --reporter=verbose",
Expand Down
2 changes: 1 addition & 1 deletion js/stateless.js/src/rpc-interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export const CompressedAccountResult = pick({
leafIndex: number(),
tree: PublicKeyFromString,
seq: nullable(BNFromInt),
slotUpdated: BNFromInt,
slotCreated: BNFromInt,
});

export const TokenDataResult = pick({
Expand Down
2 changes: 1 addition & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ rustup component add clippy
rustup component add rustfmt

cargo install cargo-expand wasm-pack
cargo install photon-indexer --version 0.15.0
cargo install photon-indexer --version 0.18.0

echo "📥 Downloading Node.js"
download_and_extract \
Expand Down

0 comments on commit 5ab3117

Please sign in to comment.