Skip to content

Commit 70aa84e

Browse files
authored
Merge pull request #46 from coldbox-modules/development
v2.1.6
2 parents 83dca5d + 29b8450 commit 70aa84e

10 files changed

Lines changed: 948 additions & 85 deletions

File tree

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
# Format PR
2121
format_check:
2222
name: Checks Source Code Formatting
23-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-24.04
2424
steps:
2525
- name: Checkout Repository
2626
uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
##########################################################################################
2727
build:
2828
name: Build & Publish
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-24.04
3030
steps:
3131
- name: Checkout Repository
3232
uses: actions/checkout@v4
@@ -133,7 +133,7 @@ jobs:
133133
prep_next_release:
134134
name: Prep Next Release
135135
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
136-
runs-on: ubuntu-20.04
136+
runs-on: ubuntu-24.04
137137
needs: [ build ]
138138
steps:
139139
# Checkout development

.github/workflows/snapshot.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- 'development'
7+
workflow_dispatch:
78

89
# Unique group name per workflow-branch/tag combo
910
concurrency:
@@ -23,7 +24,7 @@ jobs:
2324
##########################################################################################
2425
format:
2526
name: Code Auto-Formatting
26-
runs-on: ubuntu-20.04
27+
runs-on: ubuntu-24.04
2728
steps:
2829
- uses: actions/checkout@v4
2930

.github/workflows/tests.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
tests:
1212
name: Tests
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-24.04
1414
env:
1515
DB_USER: root
1616
DB_PASSWORD: root
@@ -35,6 +35,9 @@ jobs:
3535
- coldboxVersion: "be"
3636
cfengine: "adobe@2023"
3737
experimental: true
38+
- coldboxVersion: "be"
39+
cfengine: "boxlang@1"
40+
experimental: true
3841
steps:
3942
- name: Checkout Repository
4043
uses: actions/checkout@v4
@@ -54,6 +57,11 @@ jobs:
5457
- name: Setup CommandBox CLI
5558
uses: Ortus-Solutions/setup-commandbox@v2.0.1
5659

60+
- name: Update Commandbox Boxlang Module
61+
if: ${{ matrix.cfengine == 'boxlang@1' }}
62+
run:
63+
box install --force commandbox-boxlang
64+
5765
# Not Needed in this module
5866
#- name: Setup Environment For Testing Process
5967
# run: |

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ logs/**
1717
# don't put token
1818
test-harness/config/token.cfm
1919
test-harness/.env
20-
/modules/
20+
/modules/
21+
# Local server configs (test artifacts)
22+
server-sentry-*.json
23+
test-harness/server-sentry-*.json

ModuleConfig.cfc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ component {
7373
"platform" : "cfml",
7474
"logger" : ( !isNull( controller ) ? controller.getSetting( "appName" ) : "sentry" ),
7575
"userInfoUDF" : "",
76-
"extraInfoUDFs" : {}
76+
"extraInfoUDFs" : {}, // these two settings may be added but they
77+
"showJavaStackTrace" : false,
78+
"throwOnPostError" : false
7779
};
7880

7981
// Try to look up the release based on a box.json

box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"Sentry",
33
"author":"Ortus Solutions <info@ortussolutions.com>",
4-
"version":"2.1.5",
4+
"version":"2.1.6",
55
"slug":"sentry",
66
"type":"modules",
77
"homepage":"https://github.com/coldbox-modules/sentry",

0 commit comments

Comments
 (0)