From e618472af32580ad08ae5c58ffb601d0501f8489 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 26 Oct 2023 12:29:37 +0300 Subject: [PATCH] Improve CI workflow --- .github/workflows/ci.yml | 29 +++---------------------- .github/workflows/perfecto.yml | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/perfecto.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 721ff644e..9920becb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,35 +8,12 @@ on: jobs: Perfecto: - name: Perfecto - runs-on: ubuntu-latest - strategy: matrix: image: [ 'ol7', 'ol8', 'ol9'] - - steps: - - name: Code checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Install perfecto-container - run: | - wget https://kaos.sh/perfecto/perfecto-container - chmod +x perfecto-container - - - name: Run Perfecto check - env: - IMAGE: ghcr.io/essentialkaos/perfecto:${{matrix.image}} - run: ./perfecto-container -A PF20 $(git diff --name-status origin/master | tr '\t' ' ' | grep -Ev '(^D| test/)' | grep '\.spec' | rev | cut -f1 -d' ' | rev | sort) + uses: ./.github/workflows/perfecto.yml + with: + image: ${{ matrix.image }} Bibop: name: Bibop Validation diff --git a/.github/workflows/perfecto.yml b/.github/workflows/perfecto.yml new file mode 100644 index 000000000..1e3e6496f --- /dev/null +++ b/.github/workflows/perfecto.yml @@ -0,0 +1,39 @@ +name: Perfecto + +on: + workflow_call: + inputs: + image: + required: true + type: string + +jobs: + Perfecto: + name: Perfecto + runs-on: ubuntu-latest + + steps: + - name: Code checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Show verion of Perfecto in docker image + run: | + docker run ghcr.io/essentialkaos/perfecto:${{inputs.image}} --version + + - name: Install perfecto-container + run: | + wget https://kaos.sh/perfecto/perfecto-container + chmod +x perfecto-container + - name: Run Perfecto check + env: + IMAGE: ghcr.io/essentialkaos/perfecto:${{inputs.image}} + run: ./perfecto-container -A PF20 $(git diff --name-status origin/master | tr '\t' ' ' | grep -Ev '(^D| tests/)' | grep '\.spec' | rev | cut -f1 -d' ' | rev | sort)