Skip to content

Commit

Permalink
Merge pull request #765 from vektor-inc/fix/old-death
Browse files Browse the repository at this point in the history
【9.72でマージ】非推奨パッケージを抹殺抹消
  • Loading branch information
kurudrive authored Mar 2, 2022
2 parents d8a7f74 + a438f95 commit 722738a
Show file tree
Hide file tree
Showing 64 changed files with 271 additions and 7,765 deletions.
39 changes: 27 additions & 12 deletions .distignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
tests
bin
dist
.wordpress-org
.git
.github
_notes/
bin/
dist/
docs/
node_modules/
tests/
.wordpress-org/
.git/
.github/
.distignore
.eslintrc.js
.gitignore
.node-version
.phpcs.xml
.phpunit.xml
.svnignore
.wp-env.json
.phpcs.xml
.wp-env.json
.wp-env.override.json
.DS_Store
composer.json
composer.lock
docker-compose.yml
Dockerfile
gulpfile.js
package-lock.json
package.json
README.md
readme.md
*sftp-config.json
node_modules/
.DS_Store
Thumbs.db
_notes/
*~
*sftp-config.json
*.before
.wp-env.override.json
*.override.json
*.override.json
27 changes: 17 additions & 10 deletions .github/workflows/build_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop
- ^feature/.+

jobs:
Expand All @@ -17,12 +19,11 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- run: cp assets/js/all.min.js .all.min.js.before
- run: cp assets/css/vkExUnit_sns_editor_style.css .vkExUnit_sns_editor_style.css.before
- run: cp assets/css/vkExUnit_style.css .vkExUnit_style.css.before
- run: cp assets/css/vkExUnit_style_in_bs.css .vkExUnit_style_in_bs.css.before
- run: cp assets/css/vkExUnit_editor_style.css .vkExUnit_editor_style.css.before
- run: cp assets/css/vkExUnit_admin.css .vkExUnit_admin.css.before
- run: cp assets/js/block.min.js .block.min.js.before
Expand All @@ -39,7 +40,6 @@ jobs:
- run: npm run gulp sass
- run: diff assets/css/vkExUnit_sns_editor_style.css .vkExUnit_sns_editor_style.css.before
- run: diff assets/css/vkExUnit_style.css .vkExUnit_style.css.before
- run: diff assets/css/vkExUnit_style_in_bs.css .vkExUnit_style_in_bs.css.before
- run: diff assets/css/vkExUnit_editor_style.css .vkExUnit_editor_style.css.before
- run: diff assets/css/vkExUnit_admin.css .vkExUnit_admin.css.before

Expand Down Expand Up @@ -70,15 +70,22 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
- uses: actions/setup-node@v1
- name: Setup Node 14.x
uses: actions/setup-node@v1
with:
node-version: 12.x
- run: npm install
node-version: 14.x
- name: install npm scripts
run: npm install
- name: install Composer Package
run: composer install
- name: install composer packages
run: ./node_modules/@wordpress/env/bin/wp-env start
- run: ./node_modules/@wordpress/env/bin/wp-env run composer 'composer install'
- run: ./node_modules/@wordpress/env/bin/wp-env run phpunit 'phpunit -c /var/www/html/wp-content/plugins/vk-all-in-one-expansion-unit/phpunit.xml.dist --verbose'
- name: Install WP-CLI
run: |
curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
chmod +x wp-cli.phar
mv wp-cli.phar /usr/local/bin/wp
- name: Build
run: npm run build
- name: Run Environment
run: npx wp-env start
- name: Run Environment
run: npm run phpunit
67 changes: 49 additions & 18 deletions .github/workflows/wp-plugin-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,32 @@ env:
plugin_name: vk-all-in-one-expansion-unit

jobs:
tag:
name: Deploy to plugin directory
plugin-deploy:
name: Deploy to Wordpress.org plugin directory
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master

- name: Build
run: composer install --optimize-autoloader --prefer-dist --no-dev
- uses: actions/setup-node@v1
with:
node-version: 14.19.0
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
- name: install npm scripts
run: npm install
- name: install Composer Package
run: composer install
- name: Install WP-CLI
run: |
curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
chmod +x wp-cli.phar
mv wp-cli.phar /usr/local/bin/wp
- name: npm Build
run: npm run build
- name: Make Distribution
run: npm run dist:org
if: contains(github.ref, 'tags/')

- name: WordPress Plugin Deploy
uses: 10up/action-wordpress-plugin-deploy@master
env:
Expand All @@ -29,15 +45,30 @@ jobs:
name: Release to GitHub
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: bash bin/dist

- name: Composer install
run: composer install --optimize-autoloader --prefer-dist --no-dev
if: contains(github.ref, 'tags/')

- run: echo "DIST_VERSION=$(echo ${{ github.ref }} | sed -E 's/^refs\/tags\/v?(.*)$/\1/')" >> $GITHUB_ENV
- run: test -e dist/${{ env.plugin_name }}_v${{ env.DIST_VERSION }}.zip
- uses: actions/checkout@master
- uses: actions/setup-node@v1
with:
node-version: 14.19.0
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
- name: install npm scripts
run: npm install
- name: install Composer Package
run: composer install
- name: Install WP-CLI
run: |
curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
chmod +x wp-cli.phar
mv wp-cli.phar /usr/local/bin/wp
- name: npm Build
run: npm run build
- name: Make Distribution
run: |
npm run dist:github
cd dist/ && zip -r ${{ env.plugin_name }}.zip ${{ env.plugin_name }}/
- run: test -e dist/${{ env.plugin_name }}.zip
- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand All @@ -48,14 +79,14 @@ jobs:
release_name: Release ${{ github.ref }}
draft: false
prerelease: false
- run : test -e dist/${{ env.plugin_name }}_v${{ env.DIST_VERSION }}.zip
- run : test -e dist/${{ env.plugin_name }}.zip
- name: Upload Release Asset
id: upload-release-asset
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./dist/${{ env.plugin_name }}_v${{ env.DIST_VERSION }}.zip
asset_name: ${{ env.plugin_name }}_v${{ env.DIST_VERSION }}.zip
asset_path: ./dist/${{ env.plugin_name }}.zip
asset_name: ${{ env.plugin_name }}.zip
asset_content_type: application/zip
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 722738a

Please sign in to comment.