Skip to content

Commit

Permalink
Merge pull request #45 from canonical/IAM-712
Browse files Browse the repository at this point in the history
ci: standardize ci
  • Loading branch information
shipperizer authored May 20, 2024
2 parents 007b6ec + b40f9b3 commit 90e12ea
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,30 @@ name: CI
# * scan the image and upload the artifacts to the repository

on:
pull_request:
push:
branches:
- "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'
if: ${{ (github.ref == 'refs/heads/main') || (github.ref_type == 'tag') }}
needs: build
uses: ./.github/workflows/publish.yaml

scan:
if: github.ref == 'refs/heads/main'
if: ${{ (github.ref == 'refs/heads/main') || (github.ref_type == 'tag') }}
needs: publish
uses: ./.github/workflows/scan.yaml
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%2Fhydra-rock%2Fmain%2Frockcraft.yaml&query=%24.version&label=Release&color=red)
[![License](https://img.shields.io/github/license/canonical/hydra-rock?label=License)](https://github.com/canonical/hydra-rock/blob/main/LICENSE)

[![CI](https://github.com/canonical/hydra-rock/actions/workflows/ci.yaml/badge.svg)](https://github.com/canonical/hydra-rock/actions/workflows/ci.yaml)
[![Release](https://github.com/canonical/hydra-rock/actions/workflows/ci.yaml/badge.svg)](https://github.com/canonical/hydra-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 90e12ea

Please sign in to comment.