Skip to content

Commit 999d595

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents 6f264e9 + 1575d3b commit 999d595

File tree

19 files changed

+145
-107
lines changed

19 files changed

+145
-107
lines changed

test-harness/.cfconfig.json renamed to .cfconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
2+
"adminPassword" : "coldbox",
23
"debuggingEnabled":true,
34
"debuggingReportExecutionTimes":false,
45
"disableInternalCFJavaComponents":false,
56
"inspectTemplate":"always",
67
"requestTimeout":"0,0,0,90",
78
"robustExceptionEnabled":true
8-
}
9+
}

‎.env.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GEOLOCATION_DEVELOPER_KEY=

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,6 @@ jobs:
3939
distribution: "adopt"
4040
java-version: "11"
4141

42-
#- name: Setup nodejs
43-
# uses: actions/setup-node@v2
44-
# with:
45-
# node-version: 12.x
46-
47-
- name: Cache CommandBox Dependencies
48-
uses: actions/cache@v1
49-
if: ${{ true }}
50-
with:
51-
path: ~/.CommandBox/artifacts
52-
key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
53-
restore-keys: |
54-
${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
55-
5642
- name: Setup CommandBox
5743
uses: Ortus-Solutions/setup-commandbox@main
5844
with:
@@ -73,10 +59,6 @@ jobs:
7359
7460
- name: Build ${{ env.MODULE_ID }}
7561
run: |
76-
#npm i npm@latest -g
77-
#npm install
78-
#npm run prod
79-
#rm -Rf node_modules
8062
box install commandbox-docbox
8163
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
8264

‎.github/workflows/gh-release.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Publish Github Release
2+
name: Github Release
3+
4+
on:
5+
push:
6+
tags:
7+
- v[0-9]+.*
8+
9+
jobs:
10+
create-release:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: taiki-e/[email protected]
15+
with:
16+
# Produced by the build/Build.cfc
17+
changelog: changelog.md
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@ jobs:
6161
restore-keys: |
6262
${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
6363
64-
- name: Install Test Harness Dependencies
65-
working-directory: ./test-harness
64+
- name: Install Dependencies
6665
run: |
66+
# Root Dependencies
6767
box install
68+
# Test Harness Dependencies
69+
cd test-harness && box install
6870
6971
- name: Start ${{ matrix.cfengine }} Server
7072
run: |
@@ -117,7 +119,7 @@ jobs:
117119
SLACK_CHANNEL: coding
118120
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
119121
SLACK_ICON_EMOJI: ":bell:"
120-
SLACK_MESSAGE: '${{ env.MODULE_ID }} tests failed :cry:'
121-
SLACK_TITLE: ${{ env.MODULE_ID }} Tests For ${{ matrix.cfengine }} failed
122+
SLACK_MESSAGE: '${{ github.repository }} tests failed :cry:'
123+
SLACK_TITLE: ${{ github.repository }} Tests For ${{ matrix.cfengine }} failed
122124
SLACK_USERNAME: CI
123125
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
.artifacts/**
44
.tmp/**
55

6+
.env
67
.engine/**
7-
test-harness/.engine/**
88
test-harness/coldbox/**
99
test-harness/docbox/**
1010
test-harness/testbox/**
1111
test-harness/logs/**
1212
test-harness/modules/**
1313

14+
# modules
15+
modules/**
16+
1417
# log files
1518
logs/**

‎box.json‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"JavaLoader",
33
"author":"Ortus Solutions.com <[email protected]>",
4-
"version":"2.1.0",
4+
"version":"2.1.1",
55
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbjavaloader/@build.version@/[email protected]@.zip",
66
"slug":"cbjavaloader",
77
"type":"modules",
@@ -22,27 +22,29 @@
2222
"Brad Wood <[email protected]>",
2323
"Curt Gratz <[email protected]>"
2424
],
25+
"dependencies":{},
26+
"devDependencies":{
27+
"commandbox-cfformat":"*",
28+
"commandbox-docbox":"*",
29+
"commandbox-dotenv":"*",
30+
"commandbox-cfconfig":"*"
31+
},
2532
"ignore":[
2633
"**/.*",
2734
"test-harness",
28-
"/server*.json"
35+
"/server*.json"
2936
],
30-
"dependencies":{},
31-
"devDependencies":{
32-
"commandbox-dotenv":"*",
33-
"commandbox-cfconfig":"*",
34-
"commandbox-cfformat":"*"
35-
},
36-
"installPaths":{},
37-
"testbox":{
37+
"testbox":{
3838
"runner":"http://localhost:60299/tests/runner.cfm"
3939
},
4040
"scripts":{
41+
"build:module":"task run taskFile=build/Build.cfc :projectName=`package show slug` :version=`package show version`",
42+
"build:docs":"task run taskFile=build/Build.cfc target=docs :projectName=`package show slug` :version=`package show version`",
4143
"release":"recipe build/release.boxr",
4244
"format":"cfformat run models/,test-harness/**/*.cfc,ModuleConfig.cfc --overwrite",
4345
"format:watch":"cfformat watch models/,test-harness/**/*.cfc,ModuleConfig.cfc ./.cfformat.json",
4446
"format:check":"cfformat check models/,test-harness/**/*.cfc,ModuleConfig.cfc",
45-
"cfpm":"echo '\".engine/adobe2021/WEB-INF/cfusion/bin/cfpm.sh\"' | run",
47+
"cfpm":"echo '\".engine/adobe2021/WEB-INF/cfusion/bin/cfpm.sh\"' | run",
4648
"cfpm:install":"echo '\".engine/adobe2021/WEB-INF/cfusion/bin/cfpm.sh\" install ${1}' | run",
4749
"install:2021":"run-script cfpm:install zip,debugger"
4850
}

‎build/Build.cfc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ component {
2323
"test-harness",
2424
"(package|package-lock).json",
2525
"webpack.config.js",
26+
"server-.*\.json",
2627
"^\..*"
2728
];
2829

‎changelog.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
----
99

10+
## [2.1.1] => 2022-MAR-09
11+
12+
### Fixed
13+
14+
* Updated the `setup-commandbox` command to avoid having the `box.zip` included in the repo
15+
* Removal of `server-*.json` files on the final build
16+
* Updated github actions to latests module standards
17+
18+
----
19+
1020
## [2.1.0] => 2022-FEB-04
1121

1222
### Added

‎models/javaloader/JavaCompiler.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,13 @@
142142
<cfreturn jarPath/>
143143
</cffunction>
144144

145-
<cffunction name="getVersion" hint="returns the version number" access="public" returntype="string" output="false">
145+
<cffunction
146+
name ="getVersion"
147+
hint ="returns the version number"
148+
access ="public"
149+
returntype="string"
150+
output ="false"
151+
>
146152
<cfreturn "0.1.b"/>
147153
</cffunction>
148154

0 commit comments

Comments
 (0)