diff --git a/.gitea/workflows/almalinux8.yaml b/.gitea/workflows/almalinux8.yaml index 94ff4df..ff23cef 100644 --- a/.gitea/workflows/almalinux8.yaml +++ b/.gitea/workflows/almalinux8.yaml @@ -11,9 +11,10 @@ jobs: runs-on: ubuntu-latest container: image: ghcr.io/catthehacker/ubuntu:act-latest - matrix: - flavor: ["default", "micro"] - version: ["8.8", "8.9", "8.10"] + strategy: + matrix: + flavor: ["default", "micro"] + version: ["8.8", "8.9", "8.10"] steps: - name: Check out repository code uses: actions/checkout@v4 @@ -27,7 +28,7 @@ jobs: - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 - if: ${{ matrix.flavor }} == 'default' - name: Build and push almalinux + name: Build and push almalinux base uses: docker/build-push-action@v5 with: # platforms: linux/amd64,linux/arm64 @@ -51,14 +52,14 @@ jobs: tags: | ${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}-${{ matrix.flavor }} - if: ${{ matrix.flavor }} == 'default' - name: Scan almalinux9 image with Trivy + name: Scan almalinux image with Trivy uses: aquasecurity/trivy-action@0.20.0 with: image-ref: '${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}' format: 'sarif' output: 'trivy-results.sarif' - if: ${{ matrix.flavor }} == 'micro' - name: Scan almalinux9 image with Trivy + name: Scan almalinux image with Trivy uses: aquasecurity/trivy-action@0.20.0 with: image-ref: '${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}-${{ matrix.flavor }}' diff --git a/.gitea/workflows/almalinux9.yaml b/.gitea/workflows/almalinux9.yaml index 8585a88..ede6ca3 100644 --- a/.gitea/workflows/almalinux9.yaml +++ b/.gitea/workflows/almalinux9.yaml @@ -11,9 +11,10 @@ jobs: runs-on: ubuntu-latest container: image: ghcr.io/catthehacker/ubuntu:act-latest - matrix: - flavor: ["default", "micro"] - version: ["9.3", "9.4", "9.5"] + strategy: + matrix: + flavor: ["default", "micro"] + version: ["9.3", "9.4", "9.5"] steps: - name: Check out repository code uses: actions/checkout@v4