Skip to content

Commit

Permalink
Merge branch 'dev' into releases/v4
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesIves committed Jul 5, 2024
2 parents 5c6e9e9 + b8c9eb0 commit 386cc30
Show file tree
Hide file tree
Showing 18 changed files with 326 additions and 176 deletions.
2 changes: 0 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# These are supported funding model platforms

github: [JamesIves]
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/BUG.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Bug Report 🐝
description: Create a bug report to help us improve the action.
title: 'bug: 🐝 '
labels: ['bug 🐝', 'triage ⚠️']
assignees:
- JamesIves
body:
- type: markdown
attributes:
value: |
Thank you for taking the time to report a bug. Please fill out the sections below to help us reproduce the issue and improve the action. If you're unsure about something, feel free to skip it or write N/A in the field.
[Please check the Q&A before posting an issue here](https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AQ%26A).
- type: textarea
id: bug-description
attributes:
label: Describe the bug
description: 'Please provide a clear and concise description of what the bug is and what you expected to happen.'
validations:
required: true
- type: textarea
id: reproduction-steps
attributes:
label: Reproduction Steps
description: 'Steps to reproduce the behavior. Please provide a minimal example if possible.'
validations:
required: true
- type: textarea
id: logs
attributes:
label: Logs
description: "Please provide your deployment logs if applicable. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again."
render: shell
validations:
required: false
- type: textarea
id: workflow
attributes:
label: Workflow
description: 'Please provide a link or snippet of your workflow yml file.'
render: yml
validations:
required: true
- type: textarea
id: additional-comments
attributes:
label: Additional Comments
description: 'Add any other context about the problem here that does not fit elsewhere.'
validations:
required: false
28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.md

This file was deleted.

File renamed without changes
File renamed without changes
37 changes: 37 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
changelog:
categories:
- title: Breaking Changes 💥
labels:
- breaking 💥
- breaking
- title: New Features 🎉
labels:
- feature ✨
- feat
- title: Bug Fixes 🐝
labels:
- fix 🐝
- bug 🐝
- fix
- title: Performance ⚡
labels:
- performance ⚡
- perf
- title: Build 🔧
labels:
- build 🔧
- build
- title: Testing 🧪
labels:
- test 🧪
- test
- title: Documentation 📖
labels:
- documentation 📖
- docs
- title: Dependencies 🤖
labels:
- dependencies
- title: Other Changes
labels:
- '*'
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: unit-tests
name: Unit Tests 🧪
on:
pull_request:
branches:
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:
yarn test
- name: Uploade CodeCov Report
uses: codecov/codecov-action@v4.4.0
uses: codecov/codecov-action@v4.5.0
with:
token: ${{ secrets.CODECOV_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'CodeQL'
name: CodeQL Analysis 🔍
on:
push:
branches:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Code to Release Branch
name: Deploy Code to Release Branch 🚀
on:
workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: integration-tests
name: Integration Tests 🧪
on:
workflow_dispatch:
inputs:
Expand Down
95 changes: 95 additions & 0 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name: Label Pull Requests 🏷️

on:
pull_request:
types: [opened, reopened, labeled, unlabeled]

permissions:
pull-requests: write
contents: read

jobs:
assign-labels:
runs-on: ubuntu-latest
name: Assign labels in pull request 🏷️
if: github.event.pull_request.merged == false
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3

- name: Assign Labels 🏷️
id: action-assign-labels
uses: mauroalderete/action-assign-labels@v1
with:
pull-request-number: ${{ github.event.pull_request.number }}
github-token: ${{ secrets.GITHUB_TOKEN }}
conventional-commits: |
conventional-commits:
- type: 'fix'
nouns: ['FIX', 'Fix', 'fix', 'FIXED', 'Fixed', 'fixed']
labels: ['bug 🐝', 'fix 🐝']
- type: 'feature'
nouns: ['FEATURE', 'Feature', 'feature', 'FEAT', 'Feat', 'feat']
labels: ['feature ✨']
- type: 'breaking_change'
nouns: ['BREAKING CHANGE', 'BREAKING', 'MAJOR']
labels: ['breaking 💥']
- type: 'documentation'
nouns: ['doc', 'docu', 'document', 'documentation']
labels: ['documentation 📖']
- type: 'build'
nouns: ['build', 'rebuild']
labels: ['build 🔧']
- type: 'chore'
nouns: ['chore', 'tidy', 'cleanup']
labels: ['chore 🧹']
- type: 'dependencies'
nouns: ['dependency', 'dependencies', 'package', 'packages', 'bump', 'dependabot']
labels: ['dependencies 🤖']
- type: 'duplicate'
nouns: ['duplicate', 'dupe', 'copy']
labels: ['duplicate 2️⃣']
- type: 'good_first_issue'
nouns: ['good first issue', 'beginner', 'newcomer', 'first-timer']
labels: ['good first issue 🍩']
- type: 'help_wanted'
nouns: ['help wanted', 'need help', 'assistance required']
labels: ['help wanted ❕']
- type: 'proposal'
nouns: ['proposal', 'suggest', 'suggestion']
labels: ['proposal 🔮']
- type: 'question'
nouns: ['question', 'inquiry', 'query']
labels: ['question ❓']
- type: 'test'
nouns: ['test', 'testing', 'tests']
labels: ['test 🧪']
- type: 'triage'
nouns: ['triage', 'sort', 'prioritize']
labels: ['triage ⚠️']
- type: 'wontfix'
nouns: ['wontfix', 'will not fix', 'not fixing']
labels: ['wontfix 🔨']
- type: 'style'
nouns: ['style', 'formatting', 'format']
labels: ['style 🎀']
- type: 'security'
nouns: ['security', 'secure', 'safety']
labels: ['security 🔒']
- type: 'performance'
nouns: ['performance', 'speed', 'optimization']
labels: ['performance 🚀']
- type: 'refactor'
nouns: ['refactor', 'refactoring', 'rework']
labels: ['refactor 🛠']
- type: 'release'
nouns: ['release', 'deploy', 'deployment']
labels: ['release 🚀']
- type: 'ci'
nouns: ['ci', 'continuous integration', 'CI/CD']
labels: ['ci 🚀']
- type: 'hacktoberfest'
nouns: ['hacktoberfest', 'october', 'open source']
labels: ['hacktoberfest 🎃']
maintain-labels-not-matched: false
apply-changes: true
2 changes: 1 addition & 1 deletion .github/workflows/production.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Production Dependencies and Code
name: Deploy Production Dependencies and Code 🚀
on:
workflow_dispatch:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: publish-to-npm
name: Publish to Registry 📦
on:
workflow_dispatch:
inputs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sponsors.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: publish-sponsors
name: Publish Sponsors to README 📣
on:
workflow_dispatch:
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Update Major Version Tag
name: Update Major Version Tag 🏷️

on:
push:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://github.com/marketplace/actions/deploy-to-github-pages">
<img alt="GitHub Pages Deploy Action Logo" width="200px" src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/assets/icon.png">
<img alt="GitHub Pages Deploy Action Logo" width="200px" src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/docs/icon.png">
</a>
</p>

Expand Down Expand Up @@ -35,7 +35,7 @@
</p>

<p align="center">
<img src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/assets/screenshot.png" alt="">
<img src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/docs/screenshot.png" alt="">
</p>

<p align="center">
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@jamesives/github-pages-deploy-action",
"description": "GitHub action for building a project and deploying it to GitHub pages.",
"author": "James Ives <iam@jamesiv.es> (https://jamesiv.es)",
"version": "4.6.0",
"version": "4.6.1",
"license": "MIT",
"main": "lib/lib.js",
"types": "lib/lib.d.ts",
Expand Down Expand Up @@ -44,18 +44,18 @@
},
"devDependencies": {
"@types/jest": "29.5.12",
"@types/node": "20.12.12",
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"eslint": "9.3.0",
"@types/node": "20.14.9",
"@typescript-eslint/eslint-plugin": "7.15.0",
"@typescript-eslint/parser": "7.15.0",
"eslint": "9.6.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jest": "28.5.0",
"eslint-plugin-jest": "28.6.0",
"eslint-plugin-prettier": "5.1.3",
"jest": "29.7.0",
"jest-circus": "29.7.0",
"prettier": "3.2.5",
"prettier": "3.3.2",
"rimraf": "5.0.7",
"ts-jest": "29.1.2",
"typescript": "5.4.5"
"ts-jest": "29.1.5",
"typescript": "5.5.3"
}
}
Loading

0 comments on commit 386cc30

Please sign in to comment.