Skip to content

Commit

Permalink
Merge branch 'main' into al-update-ccpa-stub
Browse files Browse the repository at this point in the history
  • Loading branch information
akinsola-guardian committed Dec 27, 2023
2 parents f42e322 + fbf288b commit da4418e
Show file tree
Hide file tree
Showing 51 changed files with 5,282 additions and 6,782 deletions.
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
11 changes: 11 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
}
24 changes: 14 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
<!--
If this PR should trigger a release, make sure your title is prefixed with one of these:
### Production Release
- fix: (patch release)
- feat: (minor release)
To add this PR to the next release:
- Run `yarn changeset add` locally to create a changeset and follow the instructions.
- Push these changes to your branch.
- Once merged, changeset will create a new PR titled 'Version Packages'
These can be used but will not trigger a release:
### Beta Release
build: | chore: | ci: | docs: | style: | refactor: | perf: | test:
To trigger a major release, add ! to the prefix. Any prefix can do this, e.g.:
- refactor!: drop support for Node 6
- fix!: remove old conflicting method
To trigger a beta release:
- Run `yarn changeset add` locally to create a changeset and follow the instructions.
- Push these changes to your branch
- Apply the `[beta] @guardian/consent-management-platform` label to your pull request. This action will automatically trigger the [`cmp-beta-release-on-label.yml`](../.github/workflows/cmp-beta-release-on-label.yml) workflow.
- Upon completion, the beta version will be posted by the `github-actions bot` in your pull request.
- After testing the published beta, feel free to delete the generated .yml file if you decide not to update the cmp version.
-->

## What does this change?

## Why?

## Link to Trello
69 changes: 0 additions & 69 deletions .github/workflows/CI-monitoring.yml

This file was deleted.

153 changes: 0 additions & 153 deletions .github/workflows/CI.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/PR.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Workflow Directory

This folder consists of the workflow/action files for continuous integration and deployment in Github Action.

Below are 4 workflows that are triggered by specific actions i.e pushing to a branch, scheduled trigger

1. [`cmp-ci.yml`](cmp-ci.yml)

- Trigger: Pushing to a branch
- Description: Initiates a sequence of sub-workflows/workflow_calls ([`cmp-run-tests.yml`](cmp-run-tests.yml), [`cmp-run-checks.yml`](cmp-run-checks.yml), and [`cmp-build.yml`](cmp-build.yml)) associated with the CMP app.

2. [`cmp-beta-release-on-label.yml`](cmp-beta-release-on-label.yml)

- Trigger: Adding a label to pull requests.
- Description: Initiates a sequence of sub-workflows/workflow_calls ([`cmp-run-tests.yml`](cmp-run-tests.yml) and [`cmp-build.yml`](cmp-build.yml)) associated with the CMP app.

3. [`monitoring-ci.yml`](monitoring-ci.yml)

- Trigger: Pushing to a branch
- Description: Initiates a series of jobs related to the `cdk` and `monitoring` app. This includes running tests and checks within the `cdk` and `monitoring` directories.

4. [`daily-test.yml`](daily-test.yml)

- Trigger: Cron scheduler
- Description: This runs a test `yarn test:vendor-list` to check the vendor list is up to date.
36 changes: 36 additions & 0 deletions .github/workflows/cmp-beta-release-on-label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Publish Beta Package

# This workflow is triggered on a label being added to a PR, and will publish a beta version of the bundle to npm
# Use `yarn changeset add` to add a new change

on:
pull_request:
types: [labeled]

permissions:
checks: write
pull-requests: write
contents: write
id-token: write
issues: write

jobs:
run-tests:
name: Run tests
uses: ./.github/workflows/cmp-run-tests.yml
permissions:
checks: write
pull-requests: write
contents: write
build-app:
name: Build CMP App
needs: [run-tests]
uses: ./.github/workflows/cmp-build-release.yml
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
permissions:
checks: write
pull-requests: write
contents: write
id-token: write
issues: write
Loading

1 comment on commit da4418e

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage report

St.
Category Percentage Covered / Total
🟢 Statements 92.48% 246/266
🟢 Branches 83.19% 94/113
🟢 Functions 90% 63/70
🟢 Lines 92.22% 237/257

Test suite run success

328 tests passing in 16 suites.

Report generated by 🧪jest coverage report action from da4418e

Please sign in to comment.