Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

orbs:
stackhawk: stackhawk/stackhawk@<<pipeline.parameters.dev-orb-version>>
orb-tools: circleci/orb-tools@10.0.3
orb-tools: circleci/orb-tools@12.1.0

parameters:
# These pipeline parameters are defaults for the "trigger-integration-tests-workflow" job
Expand All @@ -18,26 +18,30 @@ workflows:
lint_pack-validate_publish-dev:
unless: << pipeline.parameters.run-integration-tests >>
jobs:
- orb-tools/lint:
lint-dir: ./src/
- orb-tools/pack:
requires:
- orb-tools/lint
# - orb-tools/lint:
# source_dir: ./src/
- orb-tools/pack
# requires:
# - orb-tools/lint

# Release dev version of orb, for testing & possible publishing.
# orb will be published as dev:alpha and dev:${CIRCLE_SHA1:0:7}.
# requires a CircleCI API token to be stored as CIRCLE_TOKEN (default)
- orb-tools/publish-dev:
orb-name: stackhawk/stackhawk
- orb-tools/publish:
orb_name: stackhawk/stackhawk
vcs_type: gh
requires:
- orb-tools/pack

# trigger an integration workflow to test the
# dev:${CIRCLE_SHA1:0:7} version of your orb
- orb-tools/trigger-integration-tests-workflow:
- orb-tools/continue:
name: trigger-integration-dev
orb_name: stackhawk/stackhawk
vcs_type: gh
pipeline_number: << pipeline.number >>
requires:
- orb-tools/publish-dev
- orb-tools/publish

# This `integration-tests_prod-release` workflow will only run
# when the run-integration-tests pipeline parameter is set to true.
Expand Down Expand Up @@ -68,11 +72,13 @@ workflows:
# Publish a semver version of the orb. relies on
# the commit subject containing the text "[semver:patch|minor|major|skip]"
# e.g. [semver:patch] will cause a patch version to be published.
- orb-tools/dev-promote-prod-from-commit-subject:
orb-name: stackhawk/stackhawk
add-pr-comment: false
fail-if-semver-not-indicated: true
publish-version-tag: false
- orb-tools/publish:
orb_name: stackhawk/stackhawk
enable_pr_comment: false
# fail-if-semver-not-indicated: true
# publish-version-tag: false
pub_type: production
vcs_type: gh
requires:
- stackhawk/hawkscan-local
filters:
Expand Down
4 changes: 2 additions & 2 deletions src/jobs/hawkscan-remote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ parameters:
default: medium

environment:
REPO_DIR: /home/zap/hawk
REPO_DIR: /home/steve/hawk

working_directory: /home/zap/hawk
working_directory: /home/steve/hawk

steps:
- checkout
Expand Down