|
14 | 14 | jobs: |
15 | 15 | build_wordpress_major_and_beta_push_to_github_and_deploy_website: |
16 | 16 | # Only run this workflow from the trunk branch and when it's triggered by a maintainer listed below |
17 | | - # if: > |
18 | | - # github.ref == 'refs/heads/trunk' && ( |
19 | | - # github.actor == 'adamziel' || |
20 | | - # github.actor == 'dmsnell' || |
21 | | - # github.actor == 'bgrgicak' || |
22 | | - # github.actor == 'brandonpayton' |
23 | | - # ) |
| 17 | + if: > |
| 18 | + github.ref == 'refs/heads/trunk' && ( |
| 19 | + github.actor == 'adamziel' || |
| 20 | + github.actor == 'dmsnell' || |
| 21 | + github.actor == 'bgrgicak' || |
| 22 | + github.actor == 'brandonpayton' |
| 23 | + ) |
24 | 24 |
|
25 | 25 | runs-on: ubuntu-latest |
26 | 26 | environment: |
@@ -66,20 +66,19 @@ jobs: |
66 | 66 | - name: Push rebuilt WordPress to GitHub |
67 | 67 | if: steps.changes.outputs.COMMIT_CHANGES == '1' |
68 | 68 | run: | |
69 | | - echo "Pushing changes to GitHub TEST" |
70 | | - # git config --global user.name "deployment_bot" |
71 | | - # git config --global user.email "deployment_bot@users.noreply.github.com" |
72 | | - # git remote set-url origin https://${{ secrets.GH_ACTOR }}:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }} |
73 | | - # git add -A |
74 | | - # git commit -a -m "Recompile WordPress major and beta versions" |
75 | | - # git pull --rebase |
76 | | - # # Push if the pull did not result in a conflict |
77 | | - # if [ $? -eq 0 ]; then |
78 | | - # git push origin HEAD:trunk |
79 | | - # fi; |
80 | | - # - name: Deploy website |
81 | | - # if: steps.changes.outputs.COMMIT_CHANGES == '1' |
82 | | - # uses: benc-uk/workflow-dispatch@v1 |
83 | | - # with: |
84 | | - # workflow: build-website.yml |
85 | | - # token: ${{ secrets.GITHUB_TOKEN }} |
| 69 | + git config --global user.name "deployment_bot" |
| 70 | + git config --global user.email "deployment_bot@users.noreply.github.com" |
| 71 | + git remote set-url origin https://${{ secrets.GH_ACTOR }}:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }} |
| 72 | + git add -A |
| 73 | + git commit -a -m "Recompile WordPress major and beta versions" |
| 74 | + git pull --rebase |
| 75 | + # Push if the pull did not result in a conflict |
| 76 | + if [ $? -eq 0 ]; then |
| 77 | + git push origin HEAD:trunk |
| 78 | + fi; |
| 79 | + - name: Deploy website |
| 80 | + if: steps.changes.outputs.COMMIT_CHANGES == '1' |
| 81 | + uses: benc-uk/workflow-dispatch@v1 |
| 82 | + with: |
| 83 | + workflow: build-website.yml |
| 84 | + token: ${{ secrets.GITHUB_TOKEN }} |
0 commit comments