Skip to content

Commit

Permalink
Merge branch 'master' into 32991-order-properties-by-tags
Browse files Browse the repository at this point in the history
  • Loading branch information
yeneastgate authored May 16, 2024
2 parents 30ab154 + 06f2105 commit 11678a7
Show file tree
Hide file tree
Showing 110 changed files with 2,982 additions and 549 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/development-zip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ name: Share development zip

on:
pull_request_review:
types: [submitted]
types:
- submitted
pull_request:
types:
- labeled

jobs:
get-versions:
if: github.event.review.state == 'approved'
if: github.event.review.state == 'approved' || github.event.label.name == 'deploy test'
name: Get versions
runs-on: ubuntu-latest
outputs:
Expand Down Expand Up @@ -35,7 +39,7 @@ jobs:
name: Build development release
needs: get-versions
# We cannot use a relative path here, or GitHub Actions does not find the workflow. This might be a bug in GitHub Actions.
uses: onOfficeGmbH/oo-wp-plugin/.github/workflows/build-release.yml@master
uses: onOffice-Web-Org/oo-wp-plugin/.github/workflows/build-release.yml@master
with:
# The trigger makes this run on a merge commit, but we want to run
# on the latest commit before the review.
Expand Down Expand Up @@ -78,4 +82,4 @@ jobs:
1. Download `onoffice-${{ needs.get-versions.outputs.developmentVersion }}-please-unpack.zip` from https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}.
2. Unpack the downloaded file to get another .zip file.
3. Upload that inner .zip file to WordPress.
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require-dev": {
"phpunit/phpunit": "^9.6",
"phpstan/phpstan": "*",
"php-coveralls/php-coveralls": "^2.6",
"php-coveralls/php-coveralls": "^2.7",
"symfony/process": "^5.4",
"phpcompatibility/php-compatibility": "*",
"wp-cli/i18n-command": "*",
Expand Down
Loading

0 comments on commit 11678a7

Please sign in to comment.