From 20f62c309cfd33f6b0af5f05bbe5f14bf478a613 Mon Sep 17 00:00:00 2001 From: Michal S Date: Wed, 26 Oct 2022 12:06:29 +0100 Subject: [PATCH] Adjust CI --- .github/workflows/test.yml | 34 ---------------------------------- .gitlab-ci.yml | 11 +++++++++-- .gitlab/.gitlab-webide.yml | 1 - 3 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/test.yml delete mode 100644 .gitlab/.gitlab-webide.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 8b7ba5d..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Lint Code -on: - workflow_dispatch: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -env: - AMETHYST_CODENAME: "Clippedy Clip" - -jobs: - formatting: - name: cargo fmt - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - components: rustfmt - - name: Format - uses: actions-rust-lang/rustfmt@v1.0.0 - clippy: - name: cargo clippy - runs-on: ubuntu-latest - container: ghcr.io/crystal-linux/crystal:latest - steps: - - uses: actions/checkout@v1 - - run: | - sudo pacman -Syu --needed --noconfirm - sudo pacman -S --noconfirm rust - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cce7fc5..7ed147d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,13 @@ image: "rust:latest" -test:cargo: +version:cargo: script: - rustc --version && cargo --version - - cargo test --workspace --verbose + +clippy:cargo: + script: + - cargo clippy --no-deps -- -D clippy::all + +fmt:cargo: + script: + - cargo fmt --check diff --git a/.gitlab/.gitlab-webide.yml b/.gitlab/.gitlab-webide.yml deleted file mode 100644 index 8b13789..0000000 --- a/.gitlab/.gitlab-webide.yml +++ /dev/null @@ -1 +0,0 @@ -