diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5136398..967c21c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,9 @@ concurrency: permissions: contents: read +env: + BUILDKIT_PROGRESS: plain + jobs: build: name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a46ccdf..6ab7057 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,9 @@ on: permissions: contents: read +env: + BUILDKIT_PROGRESS: plain + jobs: version: runs-on: ubuntu-latest @@ -96,4 +99,4 @@ jobs: - run: pnpm -r exec npm version ${{ needs.version.outputs.result }} --git-tag-version=false - - run: pnpm turbo run push:docker --filter=${{ matrix.package }} --concurrency=1 + - run: pnpm --filter=${{ matrix.package }} run push:docker diff --git a/.idea/dictionaries/fuxing.xml b/.idea/dictionaries/fuxing.xml index b46192e..dab24b6 100644 --- a/.idea/dictionaries/fuxing.xml +++ b/.idea/dictionaries/fuxing.xml @@ -1,6 +1,7 @@ + buildkit caip fuxing fuxingloh diff --git a/packages/solana-container/Dockerfile b/packages/solana-container/Dockerfile index dd9ae6d..7a4cc77 100644 --- a/packages/solana-container/Dockerfile +++ b/packages/solana-container/Dockerfile @@ -1,8 +1,8 @@ -FROM debian:bullseye as builder +FROM debian:bookworm as builder # Install os deps RUN apt update && \ - apt-get install -y build-essential clang cmake curl libudev-dev pkg-config && \ + apt-get install -y build-essential clang cmake curl libudev-dev pkg-config protobuf-compiler && \ rm -rf /var/lib/apt/lists/* # Setup rust @@ -17,14 +17,19 @@ RUN curl https://codeload.github.com/solana-labs/solana/tar.gz/refs/tags/v$SOLAN RUN mv solana-$SOLANA_VERSION /workspace/solana WORKDIR /workspace/solana +RUN cargo fetch + +# Do not optimize the build to reduce the build time, since this is testcontainers not to be used in production. +ENV RUSTFLAGS="-C opt-level=0" RUN cargo build --bin solana-test-validator --release -FROM debian:bullseye as final +FROM debian:bookworm as runner RUN apt update && \ - apt-get install -y bzip2 && \ + apt-get install -y bzip2 libssl-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=builder /workspace/solana/target/release/solana-test-validator /bin/solana-test-validator +EXPOSE 8899 8900 CMD ["solana-test-validator"] diff --git a/packages/solana-testcontainers/package.json b/packages/solana-testcontainers/package.json index 054c836..dede942 100644 --- a/packages/solana-testcontainers/package.json +++ b/packages/solana-testcontainers/package.json @@ -17,7 +17,7 @@ "build": "tsc --project tsconfig.build.json", "clean": "tsc --build --clean", "lint": "eslint .", - "test": "jest --passWithNoTests" + "test": "jest --passWithNoTests --forceExit" }, "lint-staged": { "*": [