diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25ba1f849..9dff920b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,16 +8,41 @@ on: jobs: Perfecto: - permissions: - contents: read - pull-requests: write + name: Perfecto + runs-on: ubuntu-latest + strategy: matrix: image: [ 'ol7', 'ol8', 'ol9'] - uses: ./.github/workflows/perfecto.yml - with: - image: ${{ matrix.image }} - + + 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: Run Perfecto docker image + uses: docker://ghcr.io/essentialkaos/perfecto:${{matrix.image}} + with: + args: --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:${{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) + Bibop: name: Bibop Validation runs-on: ubuntu-latest diff --git a/.github/workflows/perfecto.yml b/.github/workflows/perfecto.yml deleted file mode 100644 index cb9d4b7de..000000000 --- a/.github/workflows/perfecto.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Perfecto - -on: - workflow_call: - inputs: - image: - required: true - type: string - -jobs: - Perfecto: - name: Perfecto (${{inputs.image}}) - 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: Run Perfecto docker image - uses: docker://ghcr.io/essentialkaos/perfecto:${{inputs.image}} - with: - args: --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)