-
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* New module template updates and enhancements
* Update to use the new virtual app from ColdBox 6.7
- Loading branch information
Showing
20 changed files
with
283 additions
and
228 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| DB_HOST=127.0.0.1 | ||
| DB_PORT=3306 | ||
| DB_USER=root | ||
| DB_PASSWORD=mysql | ||
| DB_CLASS=com.mysql.cj.jdbc.Driver | ||
| DB_BUNDLEVERSION=8.0.19 | ||
| DB_BUNDLENAME=com.mysql.cj |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| patreon: ortussolutions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,104 +11,13 @@ env: | |
| MODULE_ID: cbvalidation | ||
|
|
||
| jobs: | ||
| ############################################# | ||
| ############################################# | ||
| # Tests First baby! We fail, no build :( | ||
| ############################################# | ||
| tests: | ||
| name: Tests | ||
| runs-on: ubuntu-20.04 | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ] | ||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| distribution: "adopt" | ||
| java-version: "11" | ||
|
|
||
| - name: Cache CommandBox Dependencies | ||
| uses: actions/cache@v1 | ||
| if: ${{ true }} | ||
| with: | ||
| path: ~/.CommandBox/artifacts | ||
| key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }} | ||
| restore-keys: | | ||
| ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }} | ||
| - name: Setup CommandBox | ||
| uses: elpete/[email protected] | ||
|
|
||
| - name: Install Test Harness Dependencies | ||
| working-directory: ./test-harness | ||
| run: | | ||
| box install | ||
| - name: Start ${{ matrix.cfengine }} Server | ||
| working-directory: ./test-harness | ||
| run: box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug | ||
|
|
||
| - name: CFPM Setup | ||
| if: ${{ matrix.cfengine == 'adobe@2021' }} | ||
| working-directory: ./test-harness | ||
| run: box run-script install:2021 | ||
|
|
||
| - name: Prime ${{ matrix.cfengine }} server | ||
| working-directory: ./test-harness | ||
| run: curl http://127.0.0.1:60299 | ||
|
|
||
| - name: Run Tests | ||
| working-directory: ./test-harness | ||
| run: | | ||
| mkdir tests/results | ||
| box package set testbox.runner="http://localhost:60299/tests/runner.cfm" | ||
| box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit | ||
| - name: Publish Test Results | ||
| uses: EnricoMi/publish-unit-test-result-action@v1 | ||
| if: always() | ||
| with: | ||
| files: test-harness/tests/results/**/*.xml | ||
| check_name: "${{ matrix.cfengine }} Test Results" | ||
|
|
||
| - name: Upload Test Results Artifacts | ||
| if: always() | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: test-results-${{ matrix.cfengine }} | ||
| path: | | ||
| test-harness/tests/results/**/* | ||
| - name: Slack Notification | ||
| if: failure() | ||
| uses: rtCamp/action-slack-notify@v2 | ||
| env: | ||
| SLACK_CHANNEL: coding | ||
| SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff' | ||
| SLACK_ICON_EMOJI: ":bell:" | ||
| SLACK_MESSAGE: '${{ env.MODULE_ID }} tests failed :cry:' | ||
| SLACK_TITLE: ${{ env.MODULE_ID }} Tests For ${{ matrix.cfengine }} failed | ||
| SLACK_USERNAME: CI | ||
| SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} | ||
|
|
||
| - name: Failure Debugging Info | ||
| if: ${{ failure() }} | ||
| working-directory: ./test-harness | ||
| run: | | ||
| box server log serverConfigFile="server-${{ matrix.cfengine }}.json" | ||
| - name: Upload Debugging Info To Artifacts | ||
| if: ${{ failure() }} | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: Failure Debugging Info - ${{ matrix.cfengine }} | ||
| path: | | ||
| test-harness/.engine/**/logs/* | ||
| test-harness/.engine/**/WEB-INF/cfusion/logs/* | ||
| uses: ./.github/workflows/tests.yml | ||
| secrets: | ||
| SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} | ||
|
|
||
| ############################################# | ||
| # Build Module | ||
|
|
@@ -129,17 +38,8 @@ jobs: | |
| distribution: "adopt" | ||
| java-version: "11" | ||
|
|
||
| - name: Cache CommandBox Dependencies | ||
| uses: actions/cache@v1 | ||
| if: ${{ true }} | ||
| with: | ||
| path: ~/.CommandBox/artifacts | ||
| key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }} | ||
| restore-keys: | | ||
| ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }} | ||
| - name: Setup CommandBox | ||
| uses: elpete/setup-commandbox@v1.0.0 | ||
| uses: Ortus-Solutions/setup-commandbox@main | ||
| with: | ||
| forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }} | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Publish Github Release | ||
| name: Github Release | ||
|
|
||
| on: | ||
| push: | ||
| tags: | ||
| - v[0-9]+.* | ||
|
|
||
| jobs: | ||
| create-release: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: taiki-e/[email protected] | ||
| with: | ||
| # Produced by the build/Build.cfc | ||
| changelog: changelog.md | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,89 +12,21 @@ on: | |
|
|
||
| jobs: | ||
| tests: | ||
| name: Tests | ||
| runs-on: ubuntu-20.04 | ||
| env: | ||
| DB_USER: root | ||
| DB_PASSWORD: root | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ] | ||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| distribution: "adopt" | ||
| java-version: "11" | ||
|
|
||
| - name: Setup CommandBox | ||
| uses: elpete/[email protected] | ||
|
|
||
| - name: Install Test Harness Dependencies | ||
| working-directory: ./test-harness | ||
| run: | | ||
| box install | ||
| - name: Start ${{ matrix.cfengine }} Server | ||
| working-directory: ./test-harness | ||
| run: box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug | ||
|
|
||
| - name: CFPM Setup | ||
| if: ${{ matrix.cfengine == 'adobe@2021' }} | ||
| working-directory: ./test-harness | ||
| run: box run-script install:2021 | ||
|
|
||
| - name: Prime ${{ matrix.cfengine }} server | ||
| working-directory: ./test-harness | ||
| run: curl http://127.0.0.1:60299 | ||
|
|
||
| - name: Run Tests | ||
| working-directory: ./test-harness | ||
| run: | | ||
| mkdir tests/results | ||
| box package set testbox.runner="http://localhost:60299/tests/runner.cfm" | ||
| box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit | ||
| - name: Publish PR Test Reports | ||
| uses: mikepenz/action-junit-report@v2 | ||
| with: | ||
| report_paths: 'test-harness/tests/results/**/*.xml' | ||
| check_name: "${{ matrix.cfengine }} Test Results" | ||
| summary: true | ||
|
|
||
| - name: Failure Debugging Info | ||
| if: ${{ failure() }} | ||
| working-directory: ./test-harness | ||
| run: | | ||
| box server log serverConfigFile="server-${{ matrix.cfengine }}.json" | ||
| uses: coldbox-modules/cbvalidation/.github/workflows/tests.yml@development | ||
|
|
||
| # Format PR | ||
| format: | ||
| name: Format | ||
| runs-on: ubuntu-20.04 | ||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v2 | ||
| - uses: Ortus-Solutions/[email protected] | ||
| with: | ||
| distribution: "adopt" | ||
| java-version: "11" | ||
|
|
||
| - name: Set Up CommandBox | ||
| uses: elpete/[email protected] | ||
|
|
||
| - name: Install CFFormat | ||
| run: box install commandbox-cfformat | ||
|
|
||
| - name: Run CFFormat | ||
| run: box run-script format | ||
| cmd: run-script format | ||
|
|
||
| - name: Commit Format Changes | ||
| uses: stefanzweifel/git-auto-commit-action@v4 | ||
| with: | ||
| commit_message: Apply cfformat changes | ||
| commit_message: Apply cfformat changes | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| name: Test Suites | ||
|
|
||
| # We are a reusable Workflow only | ||
| on: | ||
| workflow_call: | ||
| secrets: | ||
| SLACK_WEBHOOK_URL: | ||
| required: true | ||
|
|
||
| jobs: | ||
| tests: | ||
| name: Tests | ||
| runs-on: ubuntu-20.04 | ||
| env: | ||
| DB_USER: root | ||
| DB_PASSWORD: root | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ] | ||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| distribution: "adopt" | ||
| java-version: "11" | ||
|
|
||
| - name: Setup Environment For Testing Process | ||
| run: | | ||
| # Setup .env | ||
| touch .env | ||
| # ENV | ||
| printf "ENVIRONMENT=development\n" >> .env | ||
| printf "DB_HOST=localhost\n" >> .env | ||
| printf "DB_USER=${{ env.DB_USER }}\n" >> .env | ||
| printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env | ||
| printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env | ||
| printf "DB_BUNDLEVERSION=8.0.19\n" >> .env | ||
| printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env | ||
| - name: Setup CommandBox CLI | ||
| uses: Ortus-Solutions/setup-commandbox@main | ||
|
|
||
| - name: Install Dependencies | ||
| run: | | ||
| box install | ||
| cd test-harness && box install | ||
| - name: Start ${{ matrix.cfengine }} Server | ||
| run: | | ||
| box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug | ||
| # Install Adobe 2021 cfpm modules | ||
| if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then | ||
| box run-script install:2021 | ||
| fi | ||
| curl http://127.0.0.1:60299 | ||
| - name: Run Tests | ||
| run: | | ||
| mkdir -p test-harness/tests/results | ||
| box testbox run --verbose outputFile=test-harness/tests/results/test-results outputFormats=json,antjunit | ||
| ls -lR test-harness/tests | ||
| - name: Publish Test Results | ||
| uses: EnricoMi/publish-unit-test-result-action@v1 | ||
| if: always() | ||
| with: | ||
| files: test-harness/tests/results/**/*.xml | ||
| check_name: "${{ matrix.cfengine }} Test Results" | ||
|
|
||
| - name: Upload Test Results to Artifacts | ||
| if: always() | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: test-results-${{ matrix.cfengine }} | ||
| path: | | ||
| test-harness/tests/results/**/* | ||
| - name: Failure Debugging Log | ||
| if: ${{ failure() }} | ||
| run: | | ||
| box server log serverConfigFile="server-${{ matrix.cfengine }}.json" | ||
| - name: Upload Debugging Log To Artifacts | ||
| if: ${{ failure() }} | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: Failure Debugging Info - ${{ matrix.cfengine }} | ||
| path: | | ||
| .engine/**/logs/* | ||
| .engine/**/WEB-INF/cfusion/logs/* | ||
| - name: Slack Notifications | ||
| # Only on failures and NOT in pull requests | ||
| if: ${{ failure() && !startsWith( 'pull_request', github.event_name ) }} | ||
| uses: rtCamp/action-slack-notify@v2 | ||
| env: | ||
| SLACK_CHANNEL: coding | ||
| SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff' | ||
| SLACK_ICON_EMOJI: ":bell:" | ||
| SLACK_MESSAGE: '${{ github.repository }} tests failed :cry:' | ||
| SLACK_TITLE: ${{ github.repository }} Tests For ${{ matrix.cfengine }} failed | ||
| SLACK_USERNAME: CI | ||
| SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,21 @@ | ||
| .vscode | ||
|
|
||
| # Artifacts and temp folders | ||
| .artifacts/** | ||
| .tmp/** | ||
|
|
||
| modules/ | ||
| # Engine + Secrets + databases | ||
| .env | ||
| .engine/** | ||
| .db/** | ||
|
|
||
| test-harness/.engine/** | ||
| test-harness/.env | ||
| # Dependencies | ||
| test-harness/coldbox/** | ||
| test-harness/docbox/** | ||
| test-harness/testbox/** | ||
| test-harness/logs/** | ||
| test-harness/modules/** | ||
|
|
||
| # modules | ||
| modules/** | ||
|
|
||
| # log files | ||
| logs/** | ||
| logs/** |
Oops, something went wrong.