From a258a6b0123552e328965c8156681e38e97183c3 Mon Sep 17 00:00:00 2001 From: Sergej Date: Tue, 16 Apr 2024 11:56:09 +0200 Subject: [PATCH] cleanup --- .github/workflows/basic.yml | 19 +++++++++++++++++++ .github/workflows/dependencies.yml | 29 ----------------------------- .github/workflows/smoke.yml | 4 ++++ 3 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/dependencies.yml diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 4ec9c74f..2cfdc13a 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -12,6 +12,10 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +concurrency: + group: ${{ github.head_ref }} + cancel-in-progress: true + # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: fmt: @@ -55,6 +59,21 @@ jobs: - name: Check Code run: cargo check + check-dependencies: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/setup + + - name: Install psvm + run: | + cargo install --git https://github.com/paritytech/psvm psvm + + - name: Check Dependency Versions + run: | + chmod +x ./scripts/check-dependency-versions.sh + ./scripts/check-dependency-versions.sh + code_coverage: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml deleted file mode 100644 index 3fddfbba..00000000 --- a/.github/workflows/dependencies.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Dependency checks - -on: - # Triggers the workflow on push or pull request events but only for the main branch - pull_request: - branches: - - main - push: - branches: - - main - workflow_dispatch: - -jobs: - check-dependencies: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup - - - name: Install Rust - run: | - rustup show - rustup toolchain install nightly - cargo install --git https://github.com/paritytech/psvm psvm - - - name: Check Dependency Versions - run: | - chmod +x ./scripts/check-dependency-versions.sh - ./scripts/check-dependency-versions.sh diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index 78f7a120..8413887e 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -12,6 +12,10 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +concurrency: + group: ${{ github.head_ref }} + cancel-in-progress: true + jobs: block-production: runs-on: ubuntu-latest