Merge branch 'main' into 3.x

codecov · Jan 29, 2024 · 90115af · 90115af
2 parents 3f0cd71 + 584f9b6
commit 90115af
Show file tree

Hide file tree

Showing 11 changed files with 430 additions and 235 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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:
@@ -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 >>
diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml
@@ -56,13 +56,14 @@ jobs:
       - codecov/upload:
           flags: backend
       - codecov/upload:
+          cli_args: -v
           file: coverage/coverage-final.json
           flags: frontend
-          xtra_args: -v -Z
+          upload_args: -Z
       - codecov/upload:
           file: coverage/coverage-final.json
           flags: alpine
-          version: v0.1.0_8880
+          version: v0.2.2
       - codecov/upload:
           flags: string_flag,ENV_VAR_CONTAINING_FLAG
     environment:
@@ -77,13 +78,14 @@ jobs:
       - codecov/upload:
           flags: backend
       - codecov/upload:
+          cli_args: -v
           file: coverage/coverage-final.json
           flags: frontend
-          xtra_args: -v -Z
+          upload_args: -Z
       - codecov/upload:
           file: coverage/coverage-final.json
           flags: linux
-          version: v0.1.0_8880
+          version: v0.2.2
       - codecov/upload:
           flags: string_flag,ENV_VAR_CONTAINING_FLAG
     environment:
@@ -98,13 +100,14 @@ jobs:
       - codecov/upload:
           flags: backend
       - codecov/upload:
+          cli_args: -v
           file: coverage/coverage-final.json
           flags: frontend
-          xtra_args: -v -Z
+          upload_args: -Z
       - codecov/upload:
           file: coverage/coverage-final.json
           flags: macos
-          version: v0.1.0_8880
+          version: v0.2.2
       - codecov/upload:
           flags: string_flag,ENV_VAR_CONTAINING_FLAG
     environment:
@@ -120,13 +123,14 @@ jobs:
       - codecov/upload:
           flags: backend
       - codecov/upload:
+          cli_args: -v
           file: coverage/coverage-final.json
           flags: frontend
-          xtra_args: -v -Z
+          upload_args: -Z
       - codecov/upload:
           file: coverage/coverage-final.json
           flags: windows
-          version: v0.1.0_8880
+          version: v0.2.2
       - codecov/upload:
           flags: string_flag,ENV_VAR_CONTAINING_FLAG
     environment:
@@ -139,10 +143,9 @@ workflows:
           filters: *filters
       - test-frontend:
           filters: *filters
-      - test-alpine:
-          filters: *filters
-          requires: [test-backend, test-frontend]
-
+#      - test-alpine:
+#          filters: *filters
+#          requires: [test-backend, test-frontend]
       - test-linux:
           filters: *filters
           requires: [test-backend, test-frontend]
@@ -157,7 +160,7 @@ workflows:
 
       - orb-tools/pack:
           filters: *filters
-          requires: [test-alpine, test-linux, test-macos, test-windows]
+          requires: [test-linux, test-macos, test-windows]
 
       - orb-tools/publish:
           enable-pr-comment: false

diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml
@@ -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 }}
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
 # codecov-circleci-orb
 
-[![codecov.io](https://codecov.io/github/codecov/codecov-circleci-orb/coverage.svg?branch=master)](https://codecov.io/github/codecov/codecov-circleci-orb)
+[![codecov.io](https://codecov.io/github/codecov/codecov-circleci-orb/coverage.svg?branch=main)](https://codecov.io/github/codecov/codecov-circleci-orb)
 [![Circle CI](https://circleci.com/gh/codecov/codecov-circleci-orb.png?style=badge)](https://circleci.com/gh/codecov/codecov-circleci-orb)