Skip to content

Commit

Permalink
Merge branch 'trunk' into facebookChnages
Browse files Browse the repository at this point in the history
  • Loading branch information
ramyakrishnai committed Jan 17, 2024
2 parents 6011b72 + d3999ba commit 8f05908
Show file tree
Hide file tree
Showing 30 changed files with 4,233 additions and 7,955 deletions.
58 changes: 58 additions & 0 deletions .github/workflows/brand-plugin-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Build and Test Module Updates in Brand Plugins
on:
pull_request:
types: [ opened, reopened, ready_for_review, synchronize ]
branches:
- main
- trunk
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

jobs:
setup:
name: Setup
runs-on: ubuntu-latest
outputs:
branch: ${{ steps.extract_branch.outputs.branch }}
steps:

- name: Extract branch name
shell: bash
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
id: extract_branch

bluehost:
name: Bluehost Build and Test
needs: setup
uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
with:
module-repo: ${{ github.repository }}
module-branch: ${{ needs.setup.outputs.branch }}
plugin-repo: 'bluehost/bluehost-wordpress-plugin'
sync-npm-package: true
secrets: inherit

hostgator:
name: HostGator Build and Test
needs: setup
uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
with:
module-repo: ${{ github.repository }}
module-branch: ${{ needs.setup.outputs.branch }}
plugin-repo: 'newfold-labs/wp-plugin-hostgator'
sync-npm-package: true
secrets: inherit

crazydomains:
name: Crazy Domains Build and Test
needs: setup
uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
with:
module-repo: ${{ github.repository }}
module-branch: ${{ needs.setup.outputs.branch }}
plugin-repo: 'newfold-labs/wp-plugin-crazy-domains'
sync-npm-package: true
secrets: inherit
116 changes: 116 additions & 0 deletions .github/workflows/hostgator_plugin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
name: Build Hostgator Plugin For Testing
on:
workflow_dispatch:
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

jobs:
build:
name: Build Plugin Zip
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.1"
coverage: none
tools: composer, cs2pr
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout plugin
uses: actions/checkout@v4
with:
repository: newfold-labs/wp-plugin-hostgator
ref: 'develop'

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 18
cache: "npm"

- name: Checkout module
uses: actions/checkout@v4
with:
path: ./modules/${{ github.repository }}

- name: Get Composer cache directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer vendor directory
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: Show versions
run: |
php --version
composer --version
node --version
npm --version
- name: Modify composer.json
run: |
node ./modules/newfold-labs/wp-module-ecommerce/scripts/update-plugin-composer.mjs ${PWD}/composer.json ${PWD}/modules
- name: Update lockfile
run: composer update

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install PHP Dependencies
run: composer install --no-progress --no-dev --optimize-autoloader --prefer-dist

- name: Setup Registry on Plugin
run: printf "\n//npm.pkg.github.com/:_authToken=${{ secrets.NEWFOLD_ACCESS_TOKEN }}" >> .npmrc

- name: NPM Install
run: npm ci --legacy-peer-deps

- name: Setup Registry on Module
working-directory: ./modules/${{ github.repository }}
run: printf "\n//npm.pkg.github.com/:_authToken=${{ secrets.NEWFOLD_ACCESS_TOKEN }}" >> .npmrc

- name: Setup module
working-directory: ./modules/${{ github.repository }}
run: npm ci --legacy-peer-deps

- name: NPM Install module
run: npm install ./modules/newfold-labs/wp-module-ecommerce --legacy-peer-deps --force

- name: View modified files
run: cat package.json composer.json

- name: Build JavaScript in module
working-directory: ./modules/${{ github.repository }}
run: npm run build

- name: Build JavaScript in plugin
run: npm run build

- name: Setup workflow context
id: workflow
working-directory: ${{ runner.temp }}
env:
REPO: "wp-plugin-hostgator"
run: |
mkdir dist
echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
- name: Prepare files
run: rsync -r --exclude-from=.distignore . ${{ steps.workflow.outputs.DIST }}

- uses: actions/upload-artifact@v3
with:
name: ${{ steps.workflow.outputs.PACKAGE }}
path: ${{ steps.workflow.outputs.DIST }}
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
run: npx wp-env start --debug

- name: Run Cypress Tests
run: npx cypress run --spec ./vendor/${{ github.repository }}/tests/cypress/integration
run: npx cypress run

- name: Store screenshots of test failures
if: ${{ failure() }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Next-generation WordPress eCommerce Experience for WordPress sites at Newfold Di
### 1. Add the Newfold Satis to your `composer.json`.

```bash
composer config repositories.newfold composer https://newfold.github.io/satis
composer config repositories.newfold composer https://newfold-labs.github.io/satis
```

### 2. Require the `newfold-labs/wp-module-ecommerce` package.
Expand Down Expand Up @@ -111,4 +111,4 @@ In rare scenarios, like UI redesign where the change is bigger or a major refact

7. Currently we don't have the permission to publish directly to the BlueHost plugin So, we need to create a fork basically of the repo then push it to that fork and then create a pull request against the develop branch.

8. The new release process is thus completed.
8. The new release process is thus completed.
2 changes: 1 addition & 1 deletion build/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '026257051cba1a80ebfd');
<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '6131043b9611749a390c');
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
],
"require": {
"newfold-labs/wp-module-installer": "^1.1",
"newfold-labs/wp-module-onboarding-data": "^0.0"
"newfold-labs/wp-module-onboarding-data": "^0.1"
},
"require-dev": {
"newfold-labs/wp-php-standards": "@stable",
Expand Down
Loading

0 comments on commit 8f05908

Please sign in to comment.