Skip to content

Commit

Permalink
Merge branch 'master' into release/T25.antman
Browse files Browse the repository at this point in the history
  • Loading branch information
Camwyn committed Jan 31, 2025
2 parents 5ff58d0 + 030fa1d commit 4fea639
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 65 deletions.
13 changes: 10 additions & 3 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
>0.2%
not dead
not op_mini all
last 2 Chrome versions
last 2 Firefox versions
last 2 Safari versions
last 2 Edge versions
last 2 Opera versions
last 2 iOS versions
last 1 Android version
last 1 ChromeAndroid version
last 1 FirefoxAndroid version
> 1%, not op_mini all, not ie <= 11, not ie_mob <= 11
52 changes: 0 additions & 52 deletions .github/actions/process-changelog/action.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: 'npm lint'
on:
pull_request:
workflow_dispatch:
paths:
- 'src/modules/**.js'
- 'src/resources/js/**.js'
- 'src/resources/postcss/**.pcss'
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
# ------------------------------------------------------------------------------
# Setup Node.
# ------------------------------------------------------------------------------
- name: Check for .nvmrc file
id: check-nvmrc
run: |
if [ -f "${{ github.workspace }}/.nvmrc" ]; then
echo "exists=true" >> $GITHUB_OUTPUT
else
echo "exists=false" >> $GITHUB_OUTPUT
fi
- uses: actions/setup-node@v4
if: steps.check-nvmrc.outputs.exists == 'true'
with:
node-version-file: '.nvmrc'
cache: 'npm'
cache-dependency-path: package-lock.json
- name: Install node modules
run: npm ci
- name: Run linting tasks
run: npm run lint
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release Branch
name: "Release: Prepare Branch"

on:
workflow_dispatch:
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
base: "${{ github.event.inputs.new-branch }}"
branch: "task/version-bump-${{ github.event.inputs.new-branch }}-${{ steps.vars.outputs.sha_short }}"
title: "Version bump for ${{ github.event.inputs.new-branch }}"
title: "[BOT] Version bump for '${{ github.event.inputs.new-branch }}'"
body: |
This is an automated PR created by ${{ github.actor }}.
It was generated by [this GitHub Action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Release - Changelog"
name: "Release: Process Changelogs"

# This action will run when it is triggered manually
on:
Expand Down Expand Up @@ -53,7 +53,8 @@ jobs:

- name: Set Variables
id: vars
run: echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
run: |
echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
- name: Set up Git configuration
run: |
Expand Down Expand Up @@ -111,7 +112,7 @@ jobs:
- name: "Process changelog"
id: process_changelog
uses: ./.github/actions/process-changelog
uses: the-events-calendar/actions/.github/actions/process-changelog@main
with:
release-version: ${{ steps.figure_out_version.outputs.RELEASE_VERSION }}
release-date: ${{ steps.format_date.outputs.RELEASE_DATE }}
Expand All @@ -124,7 +125,7 @@ jobs:
token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
base: ${{ github.ref }}
branch: "task/process-changelog/${{ steps.format_date.outputs.RELEASE_DATE }}/${{ steps.figure_out_version.outputs.RELEASE_VERSION }}/${{ steps.vars.outputs.sha_short }}"
title: "Process changelog for ${{ github.ref }}"
title: "[BOT] Process changelog for '${{ github.head_ref || github.ref_name }}'"
body: |
This is an automated PR created by ${{ github.actor }}.
It was generated by [this GitHub Action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🔁 Sync Translations
name: "Release: Sync Translations"

on:
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
base: ${{ github.head_ref || github.ref_name }}
branch: "task/i18n-update-${{ github.head_ref || github.ref_name }}-with-${{ steps.vars.outputs.sha_short }}"
title: "Generate Pot for ${{ github.head_ref || github.ref_name }}"
title: "[BOT] Generate POT file for '${{ github.head_ref || github.ref_name }}'"
assignees: ${{ github.actor }}
reviewers: the-events-calendar/engineers
body: |
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.0
18.13.0
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@moderntribe/common": "file:src/modules",
"@nfen/redux-reducer-injector": "0.0.3",
"@redux-devtools/extension": "^3.3.0",
"@the-events-calendar/product-taskmaster": "github:the-events-calendar/product-taskmaster#fix/TEC-5322-wp-67-packages",
"@the-events-calendar/product-taskmaster": "^4.0.0",
"@wordpress/a11y": "^4.11.0",
"@wordpress/data": "^10.11.0",
"@wordpress/i18n": "^5.11.0",
Expand Down

0 comments on commit 4fea639

Please sign in to comment.