Skip to content

Commit

Permalink
Merge branch 'main' into fix-ending-slash
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasrockhu-codecov authored Jan 19, 2024
2 parents f216379 + 20e29ed commit 96e6bd3
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1
setup: true
orbs:
orb-tools: circleci/orb-tools@11
orb-tools: circleci/orb-tools@12

filters: &filters
tags:
Expand All @@ -20,18 +20,18 @@ workflows:
# release dev version of orb, for testing & possible publishing.
# orb will be published as dev:alpha and dev:${CIRCLE_SHA1:0:7}.
- orb-tools/publish:
enable-pr-comment: false
enable_pr_comment: false
filters: *filters
orb-name: codecov/codecov
pub-type: dev
vcs-type: << pipeline.project.type >>
orb_name: codecov/codecov
pub_type: dev
vcs_type: << pipeline.project.type >>
requires: [orb-tools/lint, orb-tools/review, orb-tools/pack]

# trigger an integration workflow to test the
# dev:${CIRCLE_SHA1:0:7} version of your orb
- orb-tools/continue:
filters: *filters
pipeline-number: << pipeline.number >>
vcs-type: << pipeline.project.type >>
orb_name: codecov/codecov
pipeline_number: << pipeline.number >>
requires: [orb-tools/publish]

vcs_type: << pipeline.project.type >>
2 changes: 0 additions & 2 deletions .circleci/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,9 @@ workflows:
filters: *filters
- test-frontend:
filters: *filters

# - test-alpine:
# filters: *filters
# requires: [test-backend, test-frontend]

- test-linux:
filters: *filters
requires: [test-backend, test-frontend]
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/enforce-license-compliance.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Enforce License Compliance

on:
pull_request:
branches: [main, master]

jobs:
enforce-license-compliance:
runs-on: ubuntu-latest
steps:
- name: 'Enforce License Compliance'
uses: getsentry/action-enforce-license-compliance@57ba820387a1a9315a46115ee276b2968da51f3d # main
with:
fossa_api_key: ${{ secrets.FOSSA_API_KEY }}

0 comments on commit 96e6bd3

Please sign in to comment.