Skip to content

Commit

Permalink
boxlang certs
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Feb 20, 2025
1 parent 0c8d3f5 commit 2965306
Show file tree
Hide file tree
Showing 13 changed files with 136 additions and 103 deletions.
43 changes: 21 additions & 22 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
name: Weekly Test Engines
name: Daily Tests

on:
schedule:
- cron: '0 8 * * 4'
schedule:
- cron: '0 0 * * *' # Runs at 00:00 UTC every day

jobs:
tests:

uses: ./.github/workflows/tests.yml
secrets: inherit
tests:
uses: ./.github/workflows/tests.yml
secrets: inherit

notify:
needs: [ tests ]
runs-on: ubuntu-24.04
if: ${{ always() }}
steps:
- name: Slack Notifications
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: boxlang-cron
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_ICON_EMOJI: ":bell:"
SLACK_MESSAGE: '${{ github.repository }} weekly tests'
SLACK_TITLE: ${{ github.repository }} Tests results
SLACK_USERNAME: CI
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
notify:
needs: [ tests ]
runs-on: ubuntu-24.04
if: ${{ always() }}
steps:
- name: Slack Notifications
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: boxlang-cron
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_ICON_EMOJI: ":bell:"
SLACK_MESSAGE: '${{ github.repository }} weekly tests'
SLACK_TITLE: ${{ github.repository }} Tests results
SLACK_USERNAME: CI
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
5 changes: 2 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ on:
- "main"
- "master"
- "development"
- "releases/v*"
pull_request:
branches:
- "releases/v*"
- development

jobs:
tests:
uses: ./.github/workflows/tests.yml
secrets: inherit

formatCheck:
# Format PR
format_check:
name: Checks Source Code Formatting
runs-on: ubuntu-24.04
steps:
Expand Down
46 changes: 39 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ on:
default: false
type: boolean

# Manual Trigger
workflow_dispatch:
env:
MODULE_ID: cbsecurity
MODULE_ID: ${{ github.event.repository.name }}
JDK: 21
SNAPSHOT: ${{ inputs.snapshot || false }}
BUILD_ID: ${{ github.run_number }}

jobs:
##########################################################################################
Expand All @@ -27,6 +31,11 @@ jobs:
build:
name: Build & Publish
runs-on: ubuntu-24.04
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -36,6 +45,12 @@ jobs:
with:
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: ${{ env.JDK }}

- name: "Setup Environment Variables For Build Process"
id: current_version
run: |
Expand All @@ -50,7 +65,7 @@ jobs:
fi
- name: Update changelog [unreleased] with latest version
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
uses: thomaseizinger/keep-a-changelog-new-release@3.1.0
if: env.SNAPSHOT == 'false'
with:
changelogPath: ./changelog.md
Expand All @@ -61,10 +76,10 @@ jobs:
npm install -g markdownlint-cli
markdownlint changelog.md --fix
box install commandbox-docbox
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ env.BUILD_ID }} :branch=${{ env.BRANCH }}
- name: Commit Changelog To Master
uses: EndBug/[email protected].3
- name: Commit Changelog [unreleased] with latest version
uses: EndBug/[email protected].4
if: env.SNAPSHOT == 'false'
with:
author_name: Github Actions
Expand Down Expand Up @@ -118,7 +133,7 @@ jobs:
box forgebox publish --force
- name: Create Github Release
uses: taiki-e/[email protected].0
uses: taiki-e/[email protected].2
continue-on-error: true
if: env.SNAPSHOT == 'false'
with:
Expand All @@ -127,6 +142,18 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
ref: refs/tags/v${{ env.VERSION }}

- name: Inform Slack
if: ${{ always() }}
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: "Module ${{ env.MODULE_ID }} v${{ env.VERSION }} Built with ${{ job.status }}!"
SLACK_TITLE: "ColdBox Module ${{ env.MODULE_ID }}"
SLACK_USERNAME: CI
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

##########################################################################################
# Prep Next Release
##########################################################################################
Expand All @@ -135,6 +162,11 @@ jobs:
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
runs-on: ubuntu-24.04
needs: [ build ]
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
# Checkout development
- name: Checkout Repository
Expand Down Expand Up @@ -165,7 +197,7 @@ jobs:
# Commit it back to development
- name: Commit Version Bump
uses: EndBug/[email protected].3
uses: EndBug/[email protected].4
with:
author_name: Github Actions
author_email: [email protected]
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ on:
push:
branches:
- 'development'

workflow_dispatch:

# Unique group name per workflow-branch/tag combo
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
##########################################################################################
# Module Tests
Expand All @@ -20,6 +26,9 @@ jobs:
format:
name: Code Auto-Formatting
runs-on: ubuntu-24.04
permissions:
contents: write
checks: write
steps:
- uses: actions/checkout@v4

Expand All @@ -29,7 +38,7 @@ jobs:
cmd: run-script format

- name: Commit Format Changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Apply cfformat changes

Expand All @@ -40,5 +49,10 @@ jobs:
uses: ./.github/workflows/release.yml
needs: [ tests, format ]
secrets: inherit
permissions:
checks: write
pull-requests: write
contents: write
issues: write
with:
snapshot: true
31 changes: 12 additions & 19 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
strategy:
fail-fast: false
matrix:
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
coldboxVersion: [ "^6.0.0", "^7.0.0" ]
cfengine: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
coldboxVersion: [ "^7.0.0" ]
experimental: [ false ]
# Here we tests all engines against ColdBox@BE
# Experimental: ColdBox BE vs All Engines
include:
- coldboxVersion: "be"
cfengine: "lucee@5"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2018"
cfengine: "lucee@6"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2021"
Expand All @@ -36,26 +36,24 @@ jobs:
cfengine: "adobe@2023"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang@1"
cfengine: "boxlang-cfml@1"
experimental: true
steps:
- name: Checkout Repository
uses: actions/checkout@v4

# DATABASE SETUP: uncomment if you need to setup a database
# - name: Setup Database and Fixtures
# run: |
# sudo systemctl start mysql.service
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE mementifier;'
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/coolblog.sql

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "11"

- name: Setup Database and Fixtures
run: |
sudo systemctl start mysql.service
# Create Database
mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE cbsecurity;'
# Import Database
mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/cbsecurity.sql
java-version: "21"

- name: Setup Environment For Testing Process
run: |
Expand All @@ -73,11 +71,6 @@ jobs:
- name: Setup CommandBox CLI
uses: Ortus-Solutions/[email protected]

- name: Update Commandbox Boxlang Module
if: ${{ matrix.cfengine == 'boxlang@1' }}
run:
box install --force commandbox-boxlang

- name: Install Dependencies
run: |
box install
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"no-multiple-blanks": {
"maximum": 2
},
"no-duplicate-heading" : false,
"no-duplicate-header" : {
"siblings_only" : true
},
"no-duplicate-heading" : false,
"no-inline-html" : false
}
11 changes: 2 additions & 9 deletions box.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
"cbcsrf":"^3.0.0"
},
"devDependencies":{
"commandbox-boxlang":"*",
"commandbox-cfformat":"*",
"commandbox-docbox":"*",
"commandbox-dotenv":"*",
"commandbox-cfconfig":"*"
"commandbox-docbox":"*"
},
"ignore":[
"**/.*",
Expand All @@ -50,16 +49,10 @@
"format:check":"cfformat check handlers/,interceptors/,models/,test-harness/tests/specs,ModuleConfig.cfc",
"install:dependencies":"install && cd test-harness && install",
"start:lucee":"server start [email protected]",
"start:2018":"server start [email protected]",
"start:2021":"server start [email protected]",
"start:2023":"server start [email protected]",
"stop:lucee":"server stop [email protected]",
"stop:2018":"server stop [email protected]",
"stop:2021":"server stop [email protected]",
"stop:2023":"server stop [email protected]",
"logs:lucee":"server log [email protected] --follow",
"logs:2018":"server log [email protected] --follow",
"logs:2021":"server log [email protected] --follow",
"logs:2023":"server log [email protected] --follow"
},
"installPaths":{
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- BoxLang certification
- Github Actions updates

## [3.4.3] - 2024-05-09

## [3.4.2] - 2024-01-10
Expand Down
3 changes: 2 additions & 1 deletion [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
}
},
"jvm":{
"heapSize":"1024"
"heapSize":"1024",
"javaVersion":"openjdk11_jre"
},
"openBrowser":"false",
"cfconfig":{
Expand Down
33 changes: 33 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"name":"cbsecurity-boxlang@1",
"app":{
"serverHomeDirectory":".engine/boxlang",
"cfengine":"boxlang@be"
},
"web":{
"http":{
"port":"60299"
},
"rewrites":{
"enable":"true"
},
"webroot": "test-harness",
"aliases":{
"/moduleroot/cbsecurity":"../"
}
},
"JVM":{
"heapSize":"1024",
"javaVersion":"openjdk21_jre",
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
},
"openBrowser":"false",
"cfconfig":{
"file":".cfconfig.json"
},
"env":{
},
"scripts":{
"onServerInitialInstall":"install bx-compat-cfml,bx-esapi,bx-mysql --noSave"
}
}
Loading

0 comments on commit 2965306

Please sign in to comment.