Skip to content

Commit d0c1636

Browse files
elpeteelpete
committed
chore(CI): Update to new CI matrix
1 parent 790795b commit d0c1636

18 files changed

+327
-122
lines changed

‎.github/workflows/cron.yml‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,39 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
cfengine: ["lucee@5", "lucee@be", "adobe@2018", "adobe@2021", "adobe@be"]
15-
coldbox: ["coldbox@6", "coldbox@7", "coldbox@be"]
16-
javaVersion: ["openjdk8", "openjdk11"]
14+
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@1", "boxlang-cfml@1"]
15+
experimental: [ false ]
16+
include:
17+
- cfengine: "lucee@be"
18+
experimental: true
19+
- cfengine: "adobe@be"
20+
experimental: true
21+
- cfengine: "boxlang@be"
22+
experimental: true
1723
steps:
1824
- name: Checkout Repository
19-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3.2.0
2026

2127
- name: Setup Java JDK
22-
uses: actions/setup-java@v1.4.3
28+
uses: actions/setup-java@v3.9.0
2329
with:
24-
java-version: 11
30+
distribution: 'zulu'
31+
java-version: 21
2532

2633
- name: Set Up CommandBox
27-
uses: elpete/[email protected]
34+
uses: Ortus-Solutions/[email protected]
35+
with:
36+
install: commandbox-boxlang,commandbox-cfconfig
2837

2938
- name: Install dependencies
3039
run: |
3140
box install
32-
box install ${{ matrix.coldbox }} --noSave
3341
3442
- name: Start server
35-
run: box server start cfengine=${{ matrix.cfengine }} javaVersion=${{ matrix.javaVersion }} --noSaveSettings
43+
run: |
44+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
45+
curl http://127.0.0.1:8500
3646
3747
- name: Run TestBox Tests
48+
continue-on-error: ${{ matrix.experimental }}
3849
run: box testbox run

‎.github/workflows/pr.yml‎

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,64 @@ on:
1313
- development
1414

1515
jobs:
16-
#############################################
17-
# Tests First baby! We fail, no build :(
18-
#############################################
1916
tests:
20-
uses: ./.github/workflows/tests.yml
17+
runs-on: ubuntu-latest
18+
name: Tests
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@1", "boxlang-cfml@1"]
23+
experimental: [ false ]
24+
include:
25+
- cfengine: "lucee@be"
26+
experimental: true
27+
- cfengine: "adobe@be"
28+
experimental: true
29+
- cfengine: "boxlang@be"
30+
experimental: true
31+
steps:
32+
- name: Checkout Repository
33+
uses: actions/[email protected]
34+
35+
- name: Setup Java JDK
36+
uses: actions/[email protected]
37+
with:
38+
distribution: 'zulu'
39+
java-version: 21
40+
41+
- name: Setup CommandBox CLI
42+
uses: Ortus-Solutions/[email protected]
43+
with:
44+
install: commandbox-boxlang,commandbox-cfconfig
45+
46+
- name: Install dependencies
47+
run: |
48+
box install
49+
50+
- name: Start server
51+
run: |
52+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
53+
curl http://127.0.0.1:8500
54+
55+
- name: Run TestBox Tests
56+
continue-on-error: ${{ matrix.experimental }}
57+
run: box testbox run
2158

2259
format:
2360
runs-on: ubuntu-latest
2461
name: Format
2562
steps:
2663
- name: Checkout Repository
27-
uses: actions/checkout@v2
64+
uses: actions/checkout@v3.2.0
2865

2966
- name: Setup Java JDK
30-
uses: actions/setup-java@v1.4.3
67+
uses: actions/setup-java@v3.9.0
3168
with:
69+
distribution: 'zulu'
3270
java-version: 11
3371

34-
- name: Set Up CommandBox
35-
uses: elpete/setup-commandbox@v1.0.0
72+
- name: Setup CommandBox CLI
73+
uses: Ortus-Solutions/setup-commandbox@v2.0.1
3674

3775
- name: Install CFFormat
3876
run: box install commandbox-cfformat

‎.github/workflows/prerelease.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 62 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,41 @@ on:
88

99
jobs:
1010
tests:
11-
uses: ./.github/workflows/tests.yml
11+
name: Tests
12+
if: "!contains(github.event.head_commit.message, '__SEMANTIC RELEASE VERSION UPDATE__')"
13+
runs-on: ubuntu-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@1", "boxlang-cfml@1"]
18+
experimental: [ false ]
19+
steps:
20+
- name: Checkout Repository
21+
uses: actions/[email protected]
22+
23+
- name: Setup Java JDK
24+
uses: actions/[email protected]
25+
with:
26+
distribution: 'zulu'
27+
java-version: 21
28+
29+
- name: Setup CommandBox CLI
30+
uses: Ortus-Solutions/[email protected]
31+
with:
32+
install: commandbox-boxlang,commandbox-cfconfig
33+
34+
- name: Install dependencies
35+
run: |
36+
box install
37+
38+
- name: Start server
39+
run: |
40+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
41+
curl http://127.0.0.1:8500
42+
43+
- name: Run TestBox Tests
44+
continue-on-error: ${{ matrix.experimental }}
45+
run: box testbox run
1246

1347
release:
1448
name: Semantic Release
@@ -19,26 +53,47 @@ jobs:
1953
GA_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
2054
steps:
2155
- name: Checkout Repository
22-
uses: actions/checkout@v2
56+
uses: actions/checkout@v3.2.0
2357
with:
2458
fetch-depth: 0
2559

2660
- name: Setup Java JDK
27-
uses: actions/setup-java@v1.4.3
61+
uses: actions/setup-java@v3.9.0
2862
with:
29-
java-version: 11
63+
distribution: 'zulu'
64+
java-version: 21
3065

31-
- name: Set Up CommandBox
32-
uses: elpete/setup-commandbox@v1.0.0
66+
- name: Setup CommandBox CLI
67+
uses: Ortus-Solutions/setup-commandbox@v2.0.1
3368

3469
- name: Install and Configure Semantic Release
3570
run: |
3671
box install commandbox-semantic-release@^3.0.0
3772
box config set endpoints.forgebox.APIToken=${{ secrets.FORGEBOX_TOKEN }}
3873
box config set modules.commandbox-semantic-release.targetBranch=main
39-
box config set modules.commandbox-semantic-release.plugins='{ "VerifyConditions": "GitHubActionsConditionsVerifier@commandbox-semantic-release", "FetchLastRelease": "ForgeBoxReleaseFetcher@commandbox-semantic-release", "RetrieveCommits": "JGitCommitsRetriever@commandbox-semantic-release", "ParseCommit": "ConventionalChangelogParser@commandbox-semantic-release", "FilterCommits": "DefaultCommitFilterer@commandbox-semantic-release", "AnalyzeCommits": "DefaultCommitAnalyzer@commandbox-semantic-release", "VerifyRelease": "NullReleaseVerifier@commandbox-semantic-release", "GenerateNotes": "GitHubMarkdownNotesGenerator@commandbox-semantic-release", "UpdateChangelog": "FileAppendChangelogUpdater@commandbox-semantic-release", "CommitArtifacts": "NullArtifactsCommitter@commandbox-semantic-release", "PublishRelease": "ForgeBoxReleasePublisher@commandbox-semantic-release", "PublicizeRelease": "GitHubReleasePublicizer@commandbox-semantic-release" }'
74+
box config set modules.commandbox-semantic-release.plugins='{ "VerifyConditions": "GitHubActionsConditionsVerifier@commandbox-semantic-release", "FetchLastRelease": "ForgeBoxReleaseFetcher@commandbox-semantic-release", "RetrieveCommits": "JGitCommitsRetriever@commandbox-semantic-release", "ParseCommit": "ConventionalChangelogParser@commandbox-semantic-release", "FilterCommits": "DefaultCommitFilterer@commandbox-semantic-release", "AnalyzeCommits": "DefaultCommitAnalyzer@commandbox-semantic-release", "VerifyRelease": "NullReleaseVerifier@commandbox-semantic-release", "GenerateNotes": "GitHubMarkdownNotesGenerator@commandbox-semantic-release", "UpdateChangelog": "FileAppendChangelogUpdater@commandbox-semantic-release", "CommitArtifacts": "GitHubArtifactsCommitter@commandbox-semantic-release", "PublishRelease": "ForgeBoxReleasePublisher@commandbox-semantic-release", "PublicizeRelease": "GitHubReleasePublicizer@commandbox-semantic-release" }'
4075
4176
- name: Run Semantic Release
4277
env:
4378
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4479
run: box semantic-release
80+
81+
- name: Generate API Docs
82+
run: |
83+
box install commandbox-docbox
84+
box run-script generateAPIDocs
85+
86+
- name: Get Current Version
87+
id: current_version
88+
run: echo "version=`cat box.json | jq '.version' -r`" >> $GITHUB_OUTPUT
89+
90+
- name: Upload API Docs to S3
91+
uses: jakejarvis/s3-sync-action@master
92+
with:
93+
args: --acl public-read
94+
env:
95+
AWS_S3_BUCKET: "apidocs.ortussolutions.com"
96+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
97+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
98+
SOURCE_DIR: ".tmp/apidocs"
99+
DEST_DIR: "${{ github.repository }}/${{ steps.current_version.outputs.version }}"

‎.github/workflows/tests.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/tests/resources/app/coldbox
44
/node_modules
55
/modules
6+
.engine
67
jmimemagic.log
78

89
.vscode

‎box.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"hyper",
3-
"version":"7.5.2",
3+
"version":"8.0.0",
44
"author":"Eric Peterson <[email protected]>",
55
"location":"forgeboxStorage",
66
"homepage":"https://github.com/coldbox-modules/hyper",

‎[email protected]‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name":"hyper-adobe@2021",
3+
"app":{
4+
"serverHomeDirectory":".engine/adobe2021",
5+
"cfengine":"adobe@2021"
6+
},
7+
"web":{
8+
"http":{
9+
"port":"8500"
10+
},
11+
"rewrites":{
12+
"enable":"true"
13+
}
14+
},
15+
"jvm":{
16+
"heapSize":"1024",
17+
"javaVersion":"openjdk11_jre"
18+
},
19+
"openBrowser":"false",
20+
"scripts":{
21+
"onServerInstall":"cfpm install zip,debugger"
22+
}
23+
}

‎[email protected]‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"name":"hyper-adobe@2023",
3+
"app":{
4+
"serverHomeDirectory":".engine/adobe2023",
5+
"cfengine":"adobe@2023"
6+
},
7+
"web":{
8+
"http":{
9+
"port":"8500"
10+
},
11+
"rewrites":{
12+
"enable":"true"
13+
}
14+
},
15+
"jvm":{
16+
"heapSize":"1024"
17+
},
18+
"openBrowser":"false",
19+
"scripts":{
20+
"onServerInstall":"cfpm install zip,debugger"
21+
}
22+
}

‎[email protected]‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name":"hyper-adobe@2025",
3+
"app":{
4+
"serverHomeDirectory":".engine/adobe2025",
5+
"cfengine":"adobe@2025"
6+
},
7+
"web":{
8+
"http":{
9+
"port":"8500"
10+
},
11+
"rewrites":{
12+
"enable":"true"
13+
}
14+
},
15+
"jvm":{
16+
"heapSize":"1024",
17+
"javaVersion":"openjdk21_jre"
18+
},
19+
"openBrowser":"false",
20+
"scripts":{
21+
"onServerInstall":"cfpm install zip,debugger"
22+
}
23+
}

0 commit comments

Comments
 (0)