Skip to content

Commit

Permalink
Merge pull request #1 from bjd2385/fix-workflow
Browse files Browse the repository at this point in the history
fix-workflow: Fix pipeline
  • Loading branch information
Brandon Doyle authored Feb 2, 2022
2 parents 31020a9 + 85a5c64 commit 0968652
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
16 changes: 14 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameters:

orb-version:
type: string
default: 1.2.2
default: 1.3.0

orbs:
orb-tools: circleci/orb-tools@10.1.0
Expand All @@ -17,16 +17,28 @@ workflows:
on-commit:
jobs:
# Run a bunch of tests against this repo
- orb-tools/lint
- orb-tools/lint:
filters:
branches:
ignore:
- master

- orb-tools/pack:
persist-to-workspace: false
store-artifacts: false
validate: true
filters:
branches:
ignore:
- master

- shellcheck/check:
dir: ./src/scripts
exclude: SC2148
filters:
branches:
ignore:
- master

on-merge:
jobs:
Expand Down
3 changes: 1 addition & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repository:
name: chart-testing-orb
description: Helm chart-testing orb
homepage: https://github.com/bjd2385/chart-testing-orb
homepage: https://circleci.com/developer/orbs/orb/bjd2385/chart-testing

# A comma-separated list of topics to set on the repository
topics: kubernetes, helm, circleci, orb, chart-testing
Expand Down Expand Up @@ -50,7 +50,6 @@ branches:
# Required. The list of status checks to require in order to merge into this branch
contexts:
- on-commit
#- jira-lint
# Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
enforce_admins: true
# Prevent merge commits from being pushed to matching branches
Expand Down
2 changes: 1 addition & 1 deletion src/commands/install-ct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parameters:
version:
description: chart-testing version
type: string
default: 2.5.0
default: 3.5.0
kubectl-version:
description: kubectl version
type: string
Expand Down

0 comments on commit 0968652

Please sign in to comment.