Skip to content

Commit

Permalink
Merge branch 'main' into release/2.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/phpcs.yml
#	composer.json
#	includes/Pods_GF.php
#	pods-gravity-forms.php
#	readme.txt
#	src/Platform/Gravity_Forms/Feed_AddOn.php
  • Loading branch information
sclark3-godaddy committed Mar 29, 2024
2 parents 2bf9ccd + bf6c347 commit b66ec72
Show file tree
Hide file tree
Showing 24 changed files with 2,741 additions and 278 deletions.
56 changes: 56 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Export ignore handling

# Directories
/.git
/.github
/.wordpress-org
/bin
/dev
/docs
/github
/tests
/workspace

# Dot-files
.babelrc
.distignore
.editorconfig
.env
.env.example
.env.dist
.env.docker
.env.testing.slic
.eslintignore
.eslintrc.json
.gitattributes
.gitignore
.jshintrc
.nvmrc
.phpstorm.meta.php
.scrutinizer.yml
.travis.yml

# Other files
babel.config.js
CODE_OF_CONDUCT.md
codeception.dist.yml
codeception.example.yml
codeception.slic.yml
CODEOWNERS
composer.json
CONTRIBUTING.md
Gruntfile.js
jest-setup-wordpress-globals.js
jest.config.json
jest.config.js
package-lock.json
package.json
phpcs.xml
phpcs.xml.dist
phpunit.xml.dist
README.md
rollup.config.js
TESTS.md
webpack.common.js
webpack.dev.js
webpack.prod.js
78 changes: 59 additions & 19 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,33 +1,73 @@
# Auto detect text files and perform LF normalization
* text=auto

*.css linguist-generated=true
*.min.css linguist-generated=true
*.min.js linguist-generated=true
*.snap linguist-generated=true
tests/_support/_generated/* linguist-generated=true

# Export ignore handling

# Directories
/.git export-ignore
/.github export-ignore
/.wordpress-org export-ignore
/bin export-ignore
/dev export-ignore
/docs export-ignore
/tests export-ignore

# Ignore other files
/.env.* export-ignore
/codeception.* export-ignore
/composer.* export-ignore
/docs export-ignore
/phpcs.xml export-ignore
/README.md export-ignore
/tests export-ignore
/TESTS.md export-ignore
/vendor export-ignore

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
# Dot-files
.babelrc export-ignore
.distignore export-ignore
.editorconfig export-ignore
.env export-ignore
.env.example export-ignore
.env.dist export-ignore
.env.docker export-ignore
.env.testing.slic export-ignore
.eslintignore export-ignore
.eslintrc.json export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.jshintrc export-ignore
.nvmrc export-ignore
.phpstorm.meta.php export-ignore
.scrutinizer.yml export-ignore
.travis.yml export-ignore

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
# Other files
babel.config.js export-ignore
CODE_OF_CONDUCT.md export-ignore
codeception.dist.yml export-ignore
codeception.example.yml export-ignore
codeception.slic.yml export-ignore
CODEOWNERS export-ignore
composer.json export-ignore
CONTRIBUTING.md export-ignore
Gruntfile.js export-ignore
jest-setup-wordpress-globals.js export-ignore
jest.config.json export-ignore
jest.config.js export-ignore
package-lock.json export-ignore
package.json export-ignore
phpcs.xml export-ignore
phpcs.xml.dist export-ignore
phpunit.xml.dist export-ignore
README.md export-ignore
rollup.config.js export-ignore
TESTS.md export-ignore
webpack.common.js export-ignore
webpack.dev.js export-ignore
webpack.prod.js export-ignore
67 changes: 0 additions & 67 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/phpcs.yml

This file was deleted.

84 changes: 84 additions & 0 deletions .github/workflows/prepare-release-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: Prepare Release Branch
env:
PR_PREFIX: 'Pods Gravity Forms '
PR_LABELS: 'Type: Release'
MILESTONE_PREFIX: 'Pods Gravity Forms '
BRANCH_PREFIX: 'release/'
WPORG_PLUGIN_FILE: 'pods-gravity-forms.php'
WPORG_PLUGIN_VERSION_CONSTANT_NAME: 'PODS_GF_VERSION'
on:
workflow_dispatch:
inputs:
new_plugin_version:
description: 'New plugin version (without the "-a-1"), defaults to the next incremental version from package.json'
required: false
version_increment:
description: 'OR Version increment scheme (if incrementing the package.json version; patch=x.x.x, minor=x.x, major=x.0)'
required: true
type: choice
default: 'patch'
options:
- 'major'
- 'minor'
- 'patch'
jobs:
prepare_release_branch:
runs-on: ubuntu-latest
steps:
- name: Checkout the code
uses: actions/checkout@v4
with:
token: ${{ secrets.GH_BOT_PUSH }}
- name: Maybe use the version number from inputs
if: ${{ github.event.inputs.new_plugin_version != null && github.event.inputs.new_plugin_version != '' }}
shell: bash
run: |
echo "PLUGIN_VERSION=${{ github.event.inputs.new_plugin_version }}" >> $GITHUB_ENV
- name: Maybe lookup the version number from package.json
id: version-lookup
if: ${{ github.event.inputs.new_plugin_version == null || github.event.inputs.new_plugin_version == '' }}
shell: bash
run: |
echo "CURRENT_VERSION=$(jq -r .version package.json)" >> $GITHUB_OUTPUT
- name: Maybe get the next version information
if: ${{ steps.version-lookup.outputs.CURRENT_VERSION != null && steps.version-lookup.outputs.CURRENT_VERSION != '' }}
uses: reecetech/[email protected]
id: version-increment
with:
scheme: semver
increment: ${{ github.event.inputs.version_increment }}
- name: Maybe store the next version
if: ${{ steps.version-increment.outputs.version != null && steps.version-increment.outputs.version != '' }}
shell: bash
run: |
echo "PLUGIN_VERSION=${{ steps.version-increment.outputs.version }}" >> $GITHUB_ENV
- name: What are we doing?
run: |
echo PLUGIN_VERSION: ${{ env.PLUGIN_VERSION }}
- name: Run wporg-replace
uses: sc0ttkclark/[email protected]
with:
plugin_version: '${{ env.PLUGIN_VERSION }}-a-1'
plugin_version_constant_name: ${{ env.WPORG_PLUGIN_VERSION_CONSTANT_NAME }}
plugin_file: ${{ env.WPORG_PLUGIN_FILE }}
plugin_path: ${{ github.workspace }}
- name: Create Milestone
id: create-milestone
uses: WyriHaximus/[email protected]
continue-on-error: true
with:
title: '${{ env.MILESTONE_PREFIX }}${{ env.PLUGIN_VERSION }}'
env:
GITHUB_TOKEN: ${{ secrets.GH_BOT_PUSH }}
- name: Create Pull Request
id: create-pull-request
uses: peter-evans/[email protected]
with:
token: ${{ secrets.GH_BOT_PUSH }}
branch: '${{ env.BRANCH_PREFIX }}${{ env.PLUGIN_VERSION }}'
commit-message: 'Set version to ${{ env.PLUGIN_VERSION }}-a-1'
title: '${{ env.PR_PREFIX }}${{ env.PLUGIN_VERSION }}'
labels: ${{ env.PR_LABELS }}
assignees: ${{ github.actor }}
milestone: ${{ steps.create-milestone.outputs.number }}
draft: true
18 changes: 7 additions & 11 deletions .github/workflows/wordpress-plugin-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,14 @@ jobs:
name: New tag
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Check the version number from package.json
shell: bash
run: echo "PLUGIN_VERSION=$(jq -r .version package.json)" >> $GITHUB_ENV
- name: Checkout the code
uses: actions/checkout@v4
- name: WordPress Plugin Deploy
uses: 10up/action-wordpress-plugin-deploy@master
uses: 10up/action-wordpress-plugin-deploy@develop
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
- name: Send message to Slack API
uses: archive/[email protected]
id: notify
with:
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
slack-channel: C02SWND14
slack-text: The pods-gravity-forms tag has been deployed to svn.wordpress.org 🎉
- name: Output Slack response
run: echo "The result was ${{ steps.notify.outputs.slack-result }}"
VERSION: ${{ env.PLUGIN_VERSION }}
20 changes: 20 additions & 0 deletions .github/workflows/wordpress-version-checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "WordPress version checker"
on:
push:
branches:
- main
- release/*
schedule:
- cron: '0 0 * * *'

permissions:
issues: write

jobs:
wordpress-version-checker:
runs-on: ubuntu-latest
steps:
- name: WordPress version checker
uses: skaut/[email protected]
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
Loading

0 comments on commit b66ec72

Please sign in to comment.