Skip to content

Commit

Permalink
Merge pull request #270 from linchpin/release/v1.5.0
Browse files Browse the repository at this point in the history
update: move location of fonts directory, update yarn dependencies
  • Loading branch information
aaronware committed Sep 1, 2022
2 parents 9ec66bd + 42a6183 commit 73ff1d0
Show file tree
Hide file tree
Showing 30 changed files with 4,350 additions and 1,923 deletions.
2 changes: 1 addition & 1 deletion .deployment/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eo

TMP_DIR="$GITHUB_WORKSPACE/courier-notices"
TMP_DIR="$GITHUB_WORKSPACE/zip"
mkdir "$TMP_DIR"

# If there's no .gitattributes file, write a default one into place
Expand Down
1 change: 1 addition & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/vendor/dealerdirect
/vendor/phpcompatibility
/vendor/php-parallel-lint

gulpfile.babel.js
yarn.lock
config.yml
Expand Down
69 changes: 69 additions & 0 deletions .github/workflows/release-files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
on:
release:
types: [published]

name: Deploy Release Assets

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Get Version From Tag
id: get_version
uses: actions-ecosystem/action-get-latest-tag@v1.6.0
with:
semver_only: true

- name: Latest Version
id: latest_version
run: |
TAG=${{ steps.get_version.outputs.tag }}
echo ::set-output name=VERSION::${TAG#v}
- name: Cache Composer dependencies
uses: actions/cache@v3
with:
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}

- name: Composer Install
uses: php-actions/composer@v6
with:
working_dir: ./
dev: no
php_version: 7.4

- name: Install Yarn Dependencies
run: |
yarn install
yarn build
rm -rf node_modules
- name: Build Plugin UI
run: |
cd ./frontend
yarn install
yarn build
- name: Clean Build Files/Folders
run : |
chmod +x ./.deployment/cleanup.sh
sh ./.deployment/cleanup.sh;
- name: Create Sync Zip
run: |
cd ./zip
zip -r ../courier-notices.zip ./
cd ../
- name: Upload files to a GitHub release
uses: svenstaro/upload-release-action@2.3.0
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: courier-notices.zip
tag: ${{ steps.get_version.outputs.tag }}
name: courier-notices.zip
overwrite: true
24 changes: 24 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
on:
push:
branches:
- master

name: release-please
jobs:
release-please:
if: github.event_name != 'pull_request' && github.event.pull_request.merged != true
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v3
with:
release-type: php
package-name: mantle
bump-minor-pre-major: true
token: ${{ secrets.GH_BOT_TOKEN }}
versioning-strategy: always-bump-patch
extra-files: |
README.md
package.json
courier-notices.php
readme.txt
composer.json
80 changes: 0 additions & 80 deletions .github/workflows/release.yml

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/wiki.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
on:
push:
branches:
- master
tags:
- 'v*'
paths:
- .github/workflows/wiki.yml
- '**.php'

name: Update Wiki

jobs:
update_wiki:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Create Wiki Markdown
uses: php-actions/composer@v6

- name: Generate API docs
run: |
wget https://phpdoc.org/phpDocumentor.phar
php phpDocumentor.phar --directory=./application --target=./wiki --template='vendor/saggre/phpdocumentor-markdown/themes/markdown'
- name: Push Wiki Changes
uses: Andrew-Chen-Wang/github-wiki-action@v3
env:
# Make sure you have that / at the end. We use rsync
# WIKI_DIR's default is wiki/
WIKI_DIR: wiki/
GH_TOKEN: ${{ secrets.GH_WIKI_UPDATE_TOKEN }}
GH_MAIL: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
GH_NAME: ${{ github.repository_owner }}
3 changes: 2 additions & 1 deletion .phplint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ extensions:
- php
exclude:
- vendor
warning: true
- github/workspace/vendor/
warning: false
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules
pnpFallbackMode: none
2 changes: 1 addition & 1 deletion assets/scss/config/_icon-font.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$icomoon-font-family: "courier" !default;
$icomoon-font-path: "fonts" !default;
$icomoon-font-path: "../fonts" !default;

@font-face {
font-family: '#{$icomoon-font-family}';
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/ui/_admin-icons.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$icomoon-admin-font-family: "courier-admin" !default;
$icomoon-admin-font-path: "fonts" !default;
$icomoon-admin-font-path: "../fonts" !default;

$icon-pro: "\e901";
$icon-courier-logo: "\e900";
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions css/courier-notices-admin-global.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
/* Notice Colors */
@font-face {
font-family: "courier";
src: url("fonts/courier.eot?j1xoo0");
src: url("fonts/courier.eot?j1xoo0#iefix") format("embedded-opentype"), url("fonts/courier.woff2?j1xoo0") format("woff2"), url("fonts/courier.ttf?j1xoo0") format("truetype"), url("fonts/courier.woff?j1xoo0") format("woff"), url("fonts/courier.svg?j1xoo0#courier") format("svg");
src: url("../fonts/courier.eot?j1xoo0");
src: url("../fonts/courier.eot?j1xoo0#iefix") format("embedded-opentype"), url("../fonts/courier.woff2?j1xoo0") format("woff2"), url("../fonts/courier.ttf?j1xoo0") format("truetype"), url("../fonts/courier.woff?j1xoo0") format("woff"), url("../fonts/courier.svg?j1xoo0#courier") format("svg");
font-weight: normal;
font-style: normal;
font-display: block; }
Expand Down Expand Up @@ -102,8 +102,8 @@ body.wp-admin table.courier_notice_page_courier [class*="icon-"] {
* * */
@font-face {
font-family: "courier-admin";
src: url("fonts/courier-admin.eot?qlkzon");
src: url("fonts/courier-admin.eot?qlkzon#iefix") format("embedded-opentype"), url("fonts/courier-admin.ttf?qlkzon") format("truetype"), url("fonts/courier-admin.woff?qlkzon") format("woff"), url("fonts/courier-admin.svg?qlkzon#courier-admin") format("svg");
src: url("../fonts/courier-admin.eot?qlkzon");
src: url("../fonts/courier-admin.eot?qlkzon#iefix") format("embedded-opentype"), url("../fonts/courier-admin.ttf?qlkzon") format("truetype"), url("../fonts/courier-admin.woff?qlkzon") format("woff"), url("../fonts/courier-admin.svg?qlkzon#courier-admin") format("svg");
font-weight: normal;
font-style: normal;
font-display: block; }
Expand Down
8 changes: 4 additions & 4 deletions css/courier-notices-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
/* Notice Colors */
@font-face {
font-family: "courier";
src: url("fonts/courier.eot?j1xoo0");
src: url("fonts/courier.eot?j1xoo0#iefix") format("embedded-opentype"), url("fonts/courier.woff2?j1xoo0") format("woff2"), url("fonts/courier.ttf?j1xoo0") format("truetype"), url("fonts/courier.woff?j1xoo0") format("woff"), url("fonts/courier.svg?j1xoo0#courier") format("svg");
src: url("../fonts/courier.eot?j1xoo0");
src: url("../fonts/courier.eot?j1xoo0#iefix") format("embedded-opentype"), url("../fonts/courier.woff2?j1xoo0") format("woff2"), url("../fonts/courier.ttf?j1xoo0") format("truetype"), url("../fonts/courier.woff?j1xoo0") format("woff"), url("../fonts/courier.svg?j1xoo0#courier") format("svg");
font-weight: normal;
font-style: normal;
font-display: block; }
Expand Down Expand Up @@ -1711,8 +1711,8 @@ pre.courier-notice-type-css-class {
**/
@font-face {
font-family: "courier";
src: url("fonts/courier.eot?f4juv");
src: url("fonts/courier.eot?f4juv#iefix") format("embedded-opentype"), url("fonts/courier.woff2?f4juv") format("woff2"), url("fonts/courier.ttf?f4juv") format("truetype"), url("fonts/courier.woff?f4juv") format("woff"), url("fonts/courier.svg?f4juv#courier") format("svg");
src: url("../fonts/courier.eot?f4juv");
src: url("../fonts/courier.eot?f4juv#iefix") format("embedded-opentype"), url("../fonts/courier.woff2?f4juv") format("woff2"), url("../fonts/courier.ttf?f4juv") format("truetype"), url("../fonts/courier.woff?f4juv") format("woff"), url("../fonts/courier.svg?f4juv#courier") format("svg");
font-weight: normal;
font-style: normal; }

Expand Down
4 changes: 2 additions & 2 deletions css/courier-notices.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
/* Notice Colors */
@font-face {
font-family: "courier";
src: url("fonts/courier.eot?j1xoo0");
src: url("fonts/courier.eot?j1xoo0#iefix") format("embedded-opentype"), url("fonts/courier.woff2?j1xoo0") format("woff2"), url("fonts/courier.ttf?j1xoo0") format("truetype"), url("fonts/courier.woff?j1xoo0") format("woff"), url("fonts/courier.svg?j1xoo0#courier") format("svg");
src: url("../fonts/courier.eot?j1xoo0");
src: url("../fonts/courier.eot?j1xoo0#iefix") format("embedded-opentype"), url("../fonts/courier.woff2?j1xoo0") format("woff2"), url("../fonts/courier.ttf?j1xoo0") format("truetype"), url("../fonts/courier.woff?j1xoo0") format("woff"), url("../fonts/courier.svg?j1xoo0#courier") format("svg");
font-weight: normal;
font-style: normal;
font-display: block; }
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
2,213 changes: 2,211 additions & 2 deletions js/courier-notices-admin.js

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions js/courier-notices-admin.js.LICENSE.txt

This file was deleted.

0 comments on commit 73ff1d0

Please sign in to comment.