Skip to content

Commit

Permalink
Merge branch 'main' into update-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
gatici authored Nov 19, 2024
2 parents 8c55241 + ef08fbd commit a646831
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ permissions:

jobs:
auto-merge:
uses: canonical/sdcore-github-workflows/.github/workflows/dependabot_pr.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/dependabot_pr.yaml@v2.0.0
2 changes: 1 addition & 1 deletion .github/workflows/issues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ on:
jobs:
update:
name: Update Issue
uses: canonical/sdcore-github-workflows/.github/workflows/issues.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/issues.yaml@v2.0.0
secrets:
JIRA_URL: ${{ secrets.JIRA_URL }}
20 changes: 10 additions & 10 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,37 @@ on:
jobs:
codeql:
name: CodeQL Analysis
uses: canonical/sdcore-github-workflows/.github/workflows/codeql-analysis.yml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/codeql-analysis.yml@v2.0.0

check-libraries:
uses: canonical/sdcore-github-workflows/.github/workflows/check-libraries.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/check-libraries.yaml@v2.0.0
secrets:
CHARMCRAFT_AUTH: ${{ secrets.CHARMCRAFT_AUTH }}

lint-report:
uses: canonical/sdcore-github-workflows/.github/workflows/lint-report.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/lint-report.yaml@v2.0.0

terraform-check:
uses: canonical/sdcore-github-workflows/.github/workflows/terraform.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/terraform.yaml@v2.0.0

static-analysis:
uses: canonical/sdcore-github-workflows/.github/workflows/static-analysis.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/static-analysis.yaml@v2.0.0

unit-tests-with-coverage:
uses: canonical/sdcore-github-workflows/.github/workflows/unit-test.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/unit-test.yaml@v2.0.0

build:
needs:
- lint-report
- static-analysis
- unit-tests-with-coverage
uses: canonical/sdcore-github-workflows/.github/workflows/build.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/build.yaml@v2.0.0
secrets: inherit

integration-test:
needs:
- build
uses: canonical/sdcore-github-workflows/.github/workflows/integration-test.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/integration-test.yaml@v2.0.0

publish-charm:
name: Publish Charm
Expand All @@ -51,7 +51,7 @@ jobs:
- unit-tests-with-coverage
- integration-test
if: ${{ github.ref_name == 'main' }}
uses: canonical/sdcore-github-workflows/.github/workflows/publish-charm.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/publish-charm.yaml@v2.0.0
with:
track-name: 1.5
secrets:
Expand All @@ -65,7 +65,7 @@ jobs:
- unit-tests-with-coverage
- integration-test
if: ${{ (github.ref_name != 'main') && (github.event_name == 'push') }}
uses: canonical/sdcore-github-workflows/.github/workflows/publish-charm.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/publish-charm.yaml@v2.0.0
with:
branch-name: ${{ github.ref_name }}
track-name: 1.5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
jobs:
promote:
name: Promote Charm
uses: canonical/sdcore-github-workflows/.github/workflows/promote.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/promote.yaml@v2.0.0
with:
promotion: ${{ github.event.inputs.promotion }}
track-name: ${{ github.event.inputs.track-name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-libs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ permissions:
jobs:
update-lib:
name: Check libraries
uses: canonical/sdcore-github-workflows/.github/workflows/update-libs.yaml@v1.0.0
uses: canonical/sdcore-github-workflows/.github/workflows/update-libs.yaml@v2.0.0
secrets: inherit

0 comments on commit a646831

Please sign in to comment.