Skip to content

Commit

Permalink
update release actions (#213)
Browse files Browse the repository at this point in the history
* components update

* update: brand guidelines link

* added last few components

* update: shields

* update: ds preview image

* update: cdn links with version

* update: banner bg colour to transparent

* update: remove header v2 and cards from patterns

* remove: custom accordion

* update: make table bg transparent

* update: dropdown arrow data:image

* Revert "feat: Ds1.1 - Design System Updates"

* Revert "Revert "feat: Ds1.1 - Design System Updates"" (#74)

* fix: build directory (#80)

* remove: cloudcdn reference

* remove: baseurl reference

* remove: github pages dir

* remove: staging & ghpages build

* update: content cards (#94)

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>

* execute only if cookie banner exists (#103)

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>

* feat: hub header (#115)

* initial setup for templates

* update: basic hero banner

* new: teamplate area

* remove main top margin

* update colour and ensure headings are correct

* new layouts from templates

* updates to header component

* hide breadcrumb on homepage template

* new: event content card

* fix link heading size

* fix padding issue in grid spacing

* add a display to links

* content card updates

* homepage template updates

* Restyled by prettier (#105)

Co-authored-by: Restyled.io <commits@restyled.io>

* replace user research with templates

* add padding to card img

* content card updates

* new: hub header

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>

* feat: page contents (#116)

* initial setup for templates

* update: basic hero banner

* new: teamplate area

* remove main top margin

* update colour and ensure headings are correct

* new layouts from templates

* updates to header component

* hide breadcrumb on homepage template

* new: event content card

* fix link heading size

* fix padding issue in grid spacing

* add a display to links

* content card updates

* homepage template updates

* Restyled by prettier (#105)

Co-authored-by: Restyled.io <commits@restyled.io>

* replace user research with templates

* add padding to card img

* content card updates

* new: hub header

* new - page contents component

* add page contents to menu

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>

* feat: board bios (#120)

* new remad more button

* new board members pattern

* new - bare list style

* add read more example

* new: board members pattern

* update packages and style updates

* Restyled by prettier (#119)

Co-authored-by: Restyled.io <commits@restyled.io>

* install updated packages

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>

* fix: banner alignment (#121)

* hide read more content

* add spacing to index heading

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>

* fix: js lints (#123)

* move click listener

* replace loops with array iterations

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>

* feat: grid examples (#129)

* fix justify center & add justify even

* new: example pages to show how to use the grid

* re-add wmcads-grid--align-center to utilities

* ignore .history folder

* feat: styles for cms grid (#131)

* new seperate grid only css

* new buttons only css

* Only update cms styles under umb-row-inner

* accordio & typography grid styles

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* feat: large page header (#132)

* new: large version of the page header

* large header responsive styles

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* feat: docs update (#133)

* add code of conduct

* update default port and install instructions

* link and copy updates

* update preview image

* update ds link in overview

* update versioning docs

* update process docs

* add cms integration docs

Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>

* fix: cdn link (#134)

* update live cdn link

* update packages

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* new: divider style (#135)

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* feat: campaign templates (#146)

* add margin to right col

* remove dfault margin for main container

* Add ability to overlay loop on an image (campain)

* campaign page - one col

* remove width and add dynamic title

* campaign 2 col template

* styling updates

* add alt to img

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* use background instead of border (#147)

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* add white bg to content cards (#148)

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* update favicons (#158)

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* fix: resolves issues from issues list (#164)

* add transparent bg to news cards

* fix homepage spacing

* make sure all images are the same height

* update template to use default image size in cards

* fix news heading spacing

* fix breadcrumb chevron colour

* fix h2 line height

* make page contnets sticky

* fix divider spacing

* ability to add or remove example links

* make sure link wraps

* script for creating page contents

* make sure spacing matches between cards

* update dropdown arrow

* Restyled by prettier (#165)

Co-authored-by: Restyled.io <commits@restyled.io>

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>

* feat: content template sidebar (#180)

* make img height auto on mobile

* fix card spacing

* rename one col content template

* styling updates

* misc styling updates

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* fix card height on mobile

* remove transport icons

* amend hub header

* fix responsive styles

* feat: hub header amends (#184)

* remove transport icons

* amend hub header

* fix responsive styles

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* update text pane spacing

* feat: ds updates (#197)

* update logo to add transparancy

* update css grid

* fix image spacing on card

* fix nav mobile font

* simpify css grid

* increase double card image size to fit new grid

* new nav items for templates

* increase mobile nav init becuse of mayor link

* make link text and button text bold

* fix page contents js

* seperate template js

* update mobile style

* fix css grid 2 col mobile width

* add fotter links to templates

* Restyled by prettier (#198)

Co-authored-by: Restyled.io <commits@restyled.io>

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>

* update packages

* feat: search template (#199)

* update breadcrumb to use text instead of an icon

* new search template

* update search js location

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* feat: search template amends (#200)

* update breadcrumb to use text instead of an icon

* new search template

* update search js location

* search page amends & fixes

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* fix: deploy preview (#205)

* update plugins

* revert to original plugins

* update deploy preview action

* delete & reinstall packages

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

* update to report-bug md

* update release process (#212)

Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>

Co-authored-by: Chris <790945+chr1se@users.noreply.github.com>
Co-authored-by: Nathan Rogan <nathanroagn@centro.org.uk>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Nathan Rogan <nathan.rogan@wmca.org.uk>
  • Loading branch information
6 people authored Jul 8, 2021
1 parent ae834c6 commit 6941a5d
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 80 deletions.
7 changes: 4 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ updates:
- package-ecosystem: npm
directory: '/'
schedule:
interval: monthly
open-pull-requests-limit: 10
interval: daily
open-pull-requests-limit: 0
target-branch: 'release'
commit-message:
prefix: '[skip netlify]'
prefix: '[skip netlify]'
22 changes: 22 additions & 0 deletions .github/workflows/branch-guard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# if the base_ref(target branch we want to merge to) is master and the head_ref(source branch we want to merge from)
# Then throw an error, as only release is allowed to merge into master
# Otherwise this action won't run and show as success
name: 'Branch guard 🛡️'

on:
pull_request:
types: [opened, edited, synchronize]

jobs:
can-merge-to-branch:
name: Can merge to branch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checking if branch is allowed...
if: "github.base_ref == 'master' && github.head_ref != 'release'"
run: |
echo "";
echo "::error::Not allowed to merge '$GITHUB_HEAD_REF' branch into '$GITHUB_BASE_REF' branch";
echo "---";
exit 1;
2 changes: 1 addition & 1 deletion .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
lint:
name: Lint PR
name: Linting PR title
runs-on: ubuntu-latest
if: "startsWith(github.base_ref, 'release')"
steps:
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/release-notes-preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ame: Release-Notes-Preview

on:
pull_request:
branches: [master]
issue_comment:
types: [edited]

jobs:
preview:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: |
git fetch --prune --unshallow --tags
- uses: snyk/release-notes-preview@v1.6.1
with:
releaseBranch: master
env:
GITHUB_PR_USERNAME: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16 changes: 12 additions & 4 deletions .github/workflows/semantic-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release npm package
name: Release package

on:
push:
Expand All @@ -18,9 +18,9 @@ jobs:
persist-credentials: false
# Setup node environment
- name: Setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '14.x'
# Dry run a release to check if one if necessary
- name: Check for new release
uses: cycjimmy/semantic-release-action@v2.5.0
Expand All @@ -33,6 +33,14 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.SEMVER_GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
# Get modules from cache
- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
# Build site
- name: Build site
run: |
Expand Down Expand Up @@ -65,4 +73,4 @@ jobs:
# functions-dir: ./functions
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
4 changes: 2 additions & 2 deletions .restyled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ restylers:
- clang-format:
enabled: false

- prettier:
enabled: true
- name: prettier
arguments: ['--config=./.prettierrc', '--ignore-path=./.prettierignore']
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# 1. WMCA Design System

![Netlify](https://img.shields.io/netlify/04471bb6-9621-4c59-abe8-b4fdf74a3860)
![David](https://img.shields.io/david/wmcadigital/wmca-design-system?style=flat-square)
![GitHub last commit](https://img.shields.io/github/last-commit/wmcadigital/wmca-design-system?style=flat-square)
![GitHub issues](https://img.shields.io/github/issues-raw/wmcadigital/wmca-design-system?style=flat-square)
[![Netlify Status](https://img.shields.io/netlify/04471bb6-9621-4c59-abe8-b4fdf74a3860)](https://app.netlify.com/sites/wmcads/deploys)
[![David](https://img.shields.io/david/dev/wmcadigital/wmca-design-system?style=flat-square)](https://github.com/wmcadigital/wmn-design-system/blob/master/package.json)
[![Last commit](https://img.shields.io/github/last-commit/wmcadigital/wmca-design-system?style=flat-square)](https://github.com/wmcadigital/wmca-design-system/commits/master)
[![Open Github issues](https://img.shields.io/github/issues-raw/wmcadigital/wmca-design-systemstyle=flat-square)](https://github.com/wmcadigital/wmca-design-system/issues)

## 1.1. Table of contents

<!-- TOC -->

- [1. WMCA Design System](#1-wmcads-design-system)
- [1. WMCA Design System](#1-wmca-design-system)
- [1.1. Table of contents](#11-table-of-contents)
- [1.2. Overview](#12-overview)
- [1.3. Quick start](#13-quick-start)
Expand Down
65 changes: 0 additions & 65 deletions RELEASE.md

This file was deleted.

0 comments on commit 6941a5d

Please sign in to comment.