Skip to content

Commit 0ff5980

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

17 files changed

+330
-120
lines changed

‎.github/workflows/cron.yml‎

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

2128
- name: Setup Java JDK
22-
uses: actions/setup-java@v1.4.3
29+
uses: actions/setup-java@v3.9.0
2330
with:
24-
java-version: 11
31+
distribution: 'zulu'
32+
java-version: 21
2533

2634
- name: Set Up CommandBox
27-
uses: elpete/[email protected]
35+
uses: Ortus-Solutions/[email protected]
36+
with:
37+
install: commandbox-boxlang
2838

2939
- name: Install dependencies
3040
run: |
3141
box install
3242
box install ${{ matrix.coldbox }} --noSave
3343
3444
- name: Start server
35-
run: box server start cfengine=${{ matrix.cfengine }} javaVersion=${{ matrix.javaVersion }} --noSaveSettings
45+
run: |
46+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
47+
curl http://127.0.0.1:60299
3648
3749
- name: Run TestBox Tests
50+
continue-on-error: ${{ matrix.experimental }}
3851
run: box testbox run

‎.github/workflows/pr.yml‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,66 @@ 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+
coldbox: ["coldbox@6", "coldbox@7", "coldbox@be"]
25+
include:
26+
- cfengine: "lucee@be"
27+
experimental: true
28+
- cfengine: "adobe@be"
29+
experimental: true
30+
- cfengine: "boxlang@be"
31+
experimental: true
32+
steps:
33+
- name: Checkout Repository
34+
uses: actions/[email protected]
35+
36+
- name: Setup Java JDK
37+
uses: actions/[email protected]
38+
with:
39+
distribution: 'zulu'
40+
java-version: 21
41+
42+
- name: Setup CommandBox CLI
43+
uses: Ortus-Solutions/[email protected]
44+
with:
45+
install: commandbox-boxlang
46+
47+
- name: Install dependencies
48+
run: |
49+
box install
50+
box install ${{ matrix.coldbox }} --noSave
51+
52+
- name: Start server
53+
run: |
54+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
55+
curl http://127.0.0.1:60299
56+
57+
- name: Run TestBox Tests
58+
continue-on-error: ${{ matrix.experimental }}
59+
run: box testbox run
2160

2261
format:
2362
runs-on: ubuntu-latest
2463
name: Format
2564
steps:
2665
- name: Checkout Repository
27-
uses: actions/checkout@v2
66+
uses: actions/checkout@v3.2.0
2867

2968
- name: Setup Java JDK
30-
uses: actions/setup-java@v1.4.3
69+
uses: actions/setup-java@v3.9.0
3170
with:
71+
distribution: 'zulu'
3272
java-version: 11
3373

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

3777
- name: Install CFFormat
3878
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: 64 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,43 @@ 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+
coldbox: ["coldbox@6", "coldbox@7", "coldbox@be"]
20+
steps:
21+
- name: Checkout Repository
22+
uses: actions/[email protected]
23+
24+
- name: Setup Java JDK
25+
uses: actions/[email protected]
26+
with:
27+
distribution: 'zulu'
28+
java-version: 21
29+
30+
- name: Setup CommandBox CLI
31+
uses: Ortus-Solutions/[email protected]
32+
with:
33+
install: commandbox-boxlang
34+
35+
- name: Install dependencies
36+
run: |
37+
box install
38+
box install ${{ matrix.coldbox }} --noSave
39+
40+
- name: Start server
41+
run: |
42+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
43+
curl http://127.0.0.1:60299
44+
45+
- name: Run TestBox Tests
46+
continue-on-error: ${{ matrix.experimental }}
47+
run: box testbox run
1248

1349
release:
1450
name: Semantic Release
@@ -19,26 +55,47 @@ jobs:
1955
GA_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
2056
steps:
2157
- name: Checkout Repository
22-
uses: actions/checkout@v2
58+
uses: actions/checkout@v3.2.0
2359
with:
2460
fetch-depth: 0
2561

2662
- name: Setup Java JDK
27-
uses: actions/setup-java@v1.4.3
63+
uses: actions/setup-java@v3.9.0
2864
with:
29-
java-version: 11
65+
distribution: 'zulu'
66+
java-version: 21
3067

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

3471
- name: Install and Configure Semantic Release
3572
run: |
3673
box install commandbox-semantic-release@^3.0.0
3774
box config set endpoints.forgebox.APIToken=${{ secrets.FORGEBOX_TOKEN }}
3875
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" }'
76+
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" }'
4077
4178
- name: Run Semantic Release
4279
env:
4380
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4481
run: box semantic-release
82+
83+
- name: Generate API Docs
84+
run: |
85+
box install commandbox-docbox
86+
box run-script generateAPIDocs
87+
88+
- name: Get Current Version
89+
id: current_version
90+
run: echo "version=`cat box.json | jq '.version' -r`" >> $GITHUB_OUTPUT
91+
92+
- name: Upload API Docs to S3
93+
uses: jakejarvis/s3-sync-action@master
94+
with:
95+
args: --acl public-read
96+
env:
97+
AWS_S3_BUCKET: "apidocs.ortussolutions.com"
98+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
99+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
100+
SOURCE_DIR: ".tmp/apidocs"
101+
DEST_DIR: "${{ github.repository }}/${{ steps.current_version.outputs.version }}"

‎.github/workflows/tests.yml‎

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

‎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)