diff --git a/.github/docker/Dockerfile.build b/.github/docker/Dockerfile.build index e32fd09..72561e3 100644 --- a/.github/docker/Dockerfile.build +++ b/.github/docker/Dockerfile.build @@ -37,11 +37,9 @@ ENV CARGO_HOME=/usr/local/cargo ENV RUSTUP_HOME=/usr/local/rustup ENV PATH=${PATH}:/usr/local/cargo/bin:/go/bin:/home/${USER}/.local/share/solana/install/releases/${SOLANA}/bin -# Set user and working directory +# Set working directory ARG PACKAGE=bonsol WORKDIR /workspaces/${PACKAGE} -USER solana - # Install Rust components RUN rustup component add \ clippy diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml index 5a15e3b..925a9be 100644 --- a/.github/workflows/pr-workflow.yaml +++ b/.github/workflows/pr-workflow.yaml @@ -4,7 +4,8 @@ on: branches: - main jobs: - lint: + lint: + name: Lint runs-on: ubuntu-latest container: image: ghcr.io/anagrambuild/bonsol-ci-env:latest @@ -18,6 +19,7 @@ jobs: # - name: Check Clippy # uses: ./.github/tasks/check-clippy build: + name: Check runs-on: ubuntu-latest container: image: ghcr.io/anagrambuild/bonsol-ci-env:latest @@ -27,8 +29,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Build - run: cargo build -p bonsol-cli + run: cargo check test: + name: Unit Test runs-on: ubuntu-latest container: image: ghcr.io/anagrambuild/bonsol-ci-env:latest @@ -40,7 +43,7 @@ jobs: - name: Test run: cargo test e2e-test: - + name: E2E Test runs-on: ubuntu-latest container: image: ghcr.io/anagrambuild/bonsol-ci-env:latest diff --git a/.github/workflows/update-cachix.yml b/.github/workflows/update-cachix.yml index da522a7..4ad3275 100644 --- a/.github/workflows/update-cachix.yml +++ b/.github/workflows/update-cachix.yml @@ -33,5 +33,5 @@ jobs: with: name: bonsol authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix flake check - run: nix develop + - run: nix flake check + - run: nix develop