Skip to content

Commit

Permalink
Updates to account for Apple/Arm environments (#155)
Browse files Browse the repository at this point in the history
* Updates to account for Apple/Arm environments

* Removed Bacon from CI, and moved semgrep checks to CircleCI
  • Loading branch information
mikenachbaur-okta authored Sep 6, 2023
1 parent 327baa4 commit e53e2ad
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 32 deletions.
9 changes: 0 additions & 9 deletions .bacon.yml

This file was deleted.

59 changes: 46 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,78 @@
version: 2.1

orbs:
platform-helpers-general: okta/[email protected].13
general-platform-helpers: okta/[email protected]

jobs:
build:
executors:
apple-ci-arm-medium:
macos:
xcode: 14.2.0
xcode: 14.3.1
resource_class: macos.m1.medium.gen1

jobs:
setup:
executor: apple-ci-arm-medium
steps:
- checkout
- run: |
swift build
- persist_to_workspace:
root: ~/project
paths:
- .

snyk-scan:
macos:
xcode: 14.2.0
executor: apple-ci-arm-medium
steps:
- attach_workspace:
at: ~/project
- platform-helpers-general/step-load-dependencies
- platform-helpers-general/step-run-snyk-monitor:
- run:
name: Install rosetta # Needed for snyk to work on M1 machines.
command: softwareupdate --install-rosetta --agree-to-license
- run:
name: run swift package show dependencies
command: swift package show-dependencies
- general-platform-helpers/step-load-dependencies
- general-platform-helpers/step-run-snyk-monitor:
scan-all-projects: true
skip-unresolved: false
os: macos

workflows:
semgrep:
jobs:
- general-platform-helpers/job-semgrep-prepare:
name: semgrep-prepare
filters:
branches:
only:
- master
- general-platform-helpers/job-semgrep-scan:
name: semgrep-scan
filters:
branches:
only:
- master
requires:
- semgrep-prepare
security-scan:
jobs:
- build:
- setup:
filters:
branches:
only:
- master
- platform-helpers-general/job-snyk-prepare:
- general-platform-helpers/job-snyk-prepare:
name: prepare-snyk
filters:
branches:
only:
- master
requires:
- build
- setup
- snyk-scan:
name: execute-snyk
filters:
branches:
only:
- master
requires:
- prepare-snyk
10 changes: 0 additions & 10 deletions scripts/sast_scan.sh

This file was deleted.

0 comments on commit e53e2ad

Please sign in to comment.