Skip to content

Commit f5e01f1

Browse files
committed
Merge branch 'trunk' into update/release-prep-workflow
* trunk: (42 commits) updating new version build files Update AI sitegen site details test Add missing build file updated build files Bump version to 2.7.3 Update Migration Event Tracking Bump version in package-lock Bump version to 2.7.2 Skip tests Hide onboarding restart cards Use single quotes consistently. version, build and translations Change i18n update github action to use trunk instead of main Change i18n update github action to use trunk instead of main Update .github/workflows/i18n-update.yml removed filter call which deactivates plugins oops fixed loop on the wrong var only fetching languages supported in Wordpress js lint fix languages api and default english selection ... # Conflicts: # package-lock.json
2 parents e0c30ed + c4b4005 commit f5e01f1

File tree

138 files changed

+9800
-25338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+9800
-25338
lines changed

.github/workflows/brand-plugin-test.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
needs: setup
3030
uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
3131
with:
32-
only-module-tests: true
3332
module-repo: ${{ github.repository }}
3433
module-branch: ${{ needs.setup.outputs.branch }}
3534
plugin-repo: "newfold-labs/wp-plugin-bluehost"
@@ -40,7 +39,6 @@ jobs:
4039
needs: setup
4140
uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
4241
with:
43-
only-module-tests: true
4442
module-repo: ${{ github.repository }}
4543
module-branch: ${{ needs.setup.outputs.branch }}
4644
plugin-repo: "newfold-labs/wp-plugin-hostgator"
@@ -51,7 +49,6 @@ jobs:
5149
needs: setup
5250
uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
5351
with:
54-
only-module-tests: true
5552
module-repo: ${{ github.repository }}
5653
module-branch: ${{ needs.setup.outputs.branch }}
5754
plugin-repo: "newfold-labs/wp-plugin-crazy-domains"

.github/workflows/i18n-update.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: i18n Update Action
2+
3+
on:
4+
push:
5+
branches:
6+
- 'trunk'
7+
workflow_dispatch: # Allows manual trigger with a branch input
8+
inputs:
9+
base_branch:
10+
description: 'Base branch for the pull request'
11+
required: false
12+
default: 'trunk'
13+
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
jobs:
19+
call-i18n-update:
20+
uses: newfold-labs/workflows/.github/workflows/i18n-update.yml@main
21+
with:
22+
base_branch: ${{ inputs.base_branch || github.ref_name }}
23+
secrets:
24+
NEWFOLD_ACCESS_TOKEN: ${{ secrets.NEWFOLD_ACCESS_TOKEN }}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Newfold Prepare Release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
level:
7+
description: The level of release to be used.
8+
type: choice
9+
options:
10+
- patch
11+
- minor
12+
- major
13+
default: 'patch'
14+
required: true
15+
16+
jobs:
17+
18+
# This job is used to extract the branch name from the pull request or branch.
19+
setup:
20+
name: Setup
21+
runs-on: ubuntu-latest
22+
outputs:
23+
branch: ${{ steps.extract_branch.outputs.branch }}
24+
steps:
25+
- name: Extract branch name
26+
shell: bash
27+
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
28+
id: extract_branch
29+
30+
# This job runs the newfold module-prep-release workflow for this module.
31+
prep-release:
32+
name: Prepare Release
33+
needs: setup
34+
uses: newfold-labs/workflows/.github/workflows/module-prep-release.yml@add/preprelease
35+
with:
36+
module-repo: ${{ github.repository }}
37+
module-branch: ${{ needs.setup.outputs.branch }}
38+
level: ${{ inputs.level }}
39+
secrets: inherit

bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function nfd_wp_module_onboarding_register() {
2424

2525
// Set Global Constants
2626
if ( ! defined( 'NFD_ONBOARDING_VERSION' ) ) {
27-
define( 'NFD_ONBOARDING_VERSION', '2.7.0' );
27+
define( 'NFD_ONBOARDING_VERSION', '2.7.4' );
2828
}
2929
if ( ! defined( 'NFD_ONBOARDING_DIR' ) ) {
3030
define( 'NFD_ONBOARDING_DIR', __DIR__ );

build/2.7.0/426.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.0/619.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.0/705.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.0/sitegen-theme-marker.css-rtl.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.0/sitegen-theme-marker.css.asset.php

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.0/sitegen-theme-marker.css.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)