Skip to content

Commit

Permalink
ci: standardize ci
Browse files Browse the repository at this point in the history
  • Loading branch information
shipperizer committed May 20, 2024
1 parent 711e554 commit c8727cc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/push_main.yaml → .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Push (main)
name: CI

# When pushing to the "main" branch, we:
# * build the rock image
Expand All @@ -8,20 +8,28 @@ name: Push (main)
on:
push:
branches:
- main
- "main"
- "release-**"
tags:
- "v**"
paths:
- "rockcraft.yaml"
- ".github/workflows/**.yaml"
pull_request:
branches:
- "*"
workflow_dispatch:

jobs:
build:
uses: ./.github/workflows/build.yaml

publish:
if: ${{ (github.ref == 'refs/heads/main') || (github.ref_type == 'tag') }}
needs: build
uses: ./.github/workflows/publish.yaml

scan:
if: ${{ (github.ref == 'refs/heads/main') || (github.ref_type == 'tag') }}
needs: publish
uses: ./.github/workflows/scan.yaml
16 changes: 0 additions & 16 deletions .github/workflows/push_any.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![Latest Version](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcanonical%2Fkratos-rock%2Fmain%2Frockcraft.yaml&query=%24.version&label=Release&color=red)
[![License](https://img.shields.io/github/license/canonical/kratos-rock?label=License)](https://github.com/canonical/kratos-rock/blob/main/LICENSE)

[![Build](https://img.shields.io/github/actions/workflow/status/canonical/kratos-rock/push_main.yaml?label=Build)](https://github.com/canonical/kratos-rock/actions/workflows/push_main.yaml)
[![Release](https://github.com/canonical/kratos-rock/actions/workflows/ci.yaml/badge.svg)](https://github.com/canonical/kratos-rock/actions/workflows/ci.yaml)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196.svg)](https://conventionalcommits.org)

Expand Down

0 comments on commit c8727cc

Please sign in to comment.