Merge branch 'development'

coldbox-modules · Sep 25, 2024 · d34f988 · d34f988
2 parents 3d7f83a + b9e6949
commit d34f988
Show file tree

Hide file tree

Showing 11 changed files with 726 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,14 +61,46 @@ jobs:
         run: |
           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 }}
+      
+      - name: Update changelog [unreleased] with latest version
+        uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
+        if: github.ref == 'refs/heads/main'
+        with:
+          changelogPath: ./changelog.md
+          tag: v${{ env.VERSION }}
+
+      - name: Build ${{ env.MODULE_ID }}
+        run: |
+          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 }}
+
+      - name: Commit Changelog To Master
+        uses: EndBug/add-and-commit@v9.1.1
+        if: github.ref == 'refs/heads/main'
+        with:
+          author_name: Github Actions
+          author_email: info@ortussolutions.com
+          message: 'Finalized changelog for v${{ env.VERSION }}'
+          add: changelog.md
+
+      - name: Tag Version
+        uses: rickstaa/action-create-tag@v1.6.1
+        if: github.ref == 'refs/heads/main'
+        with:
+          tag: "v${{ env.VERSION }}"
+          force_push_tag: true
+          message: "Latest Release v${{ env.VERSION }}"
 
       - name: Upload Build Artifacts
         if: success()
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.MODULE_ID }}
           path: |
             .artifacts/**/*
+            changelog.md
 
       - name: Upload Binaries to S3
         uses: jakejarvis/s3-sync-action@master
@@ -109,3 +141,49 @@ jobs:
           SLACK_TITLE: "${{ env.MODULE_ID }} Build"
           SLACK_USERNAME: CI
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
+  ##########################################################################################
+  # Prep Next Release
+  ##########################################################################################
+  prep_next_release:
+    name: Prep Next Release
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-20.04
+    needs: [ build ]
+    steps:
+      # Checkout development
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          ref: development
+
+      - name: Setup CommandBox
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
+        with:
+          forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.MODULE_ID }}
+          path: .tmp
+
+      # Copy the changelog to the development branch
+      - name: Copy Changelog
+        run: |
+          cp .tmp/changelog.md changelog.md
+
+      # Bump to next version
+      - name: Bump Version
+        run: |
+          box bump --patch --!TagVersion
+
+      # Commit it back to development
+      - name: Commit Version Bump
+        uses: EndBug/add-and-commit@v9.1.4
+        with:
+          author_name: Github Actions
+          author_email: info@ortussolutions.com
+          message: 'Version bump [ci skip]'
+          add: |
+            box.json
+            changelog.md
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -0,0 +1,14 @@
+{
+	"line-length": false,
+	"single-h1": false,
+	"no-hard-tabs" : false,
+	"fenced-code-language" : false,
+	"no-bare-urls" : false,
+	"first-line-h1": false,
+	"no-multiple-blanks": {
+		"maximum": 2
+	},
+	"no-duplicate-header" : false,
+	"no-duplicate-heading" : false,
+	"no-inline-html" : false
+}
diff --git a/box.json b/box.json
@@ -2,7 +2,7 @@
     "name":"Elasticsearch for the Coldbox Framework",
     "author":"Ortus Solutions <info@ortussolutions.com",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbelasticsearch/@build.version@/cbelasticsearch-@build.version@+@build.number@.zip",
-    "version":"3.3.1",
+    "version":"3.4.0",
     "slug":"cbelasticsearch",
     "type":"modules",
     "homepage":"https://cbelasticsearch.ortusbooks.com",
@@ -50,9 +50,9 @@
         "build:module":"task run taskFile=build/Build.cfc :projectName=`package show slug` :version=`package show version`",
         "build:docs":"task run taskFile=build/Build.cfc target=docs :projectName=`package show slug` :version=`package show version`",
         "release":"recipe build/release.boxr",
-        "format":"cfformat run models,ModuleConfig.cfc --overwrite",
-        "format:watch":"cfformat watch models,ModuleConfig.cfc ./.cfformat.json",
-        "format:check":"cfformat check models,ModuleConfig.cfc",
+        "format":"cfformat run tests/specs,models,ModuleConfig.cfc --overwrite",
+        "format:watch":"cfformat watch tests/specs,models,ModuleConfig.cfc ./.cfformat.json",
+        "format:check":"cfformat check tests/specs,models,ModuleConfig.cfc",
         "install:dependencies":"install --force && cd test-harness && install --force",
         "start:elasticsearch7":"!docker run --name cbelasticsearch-es8 -d -p '9200:9200' -e 'discovery.type=single-node' -e 'xpack.security.enabled=false' elasticsearch:7.17.2",
         "start:elasticsearch":"!docker run --name cbelasticsearch-es8 -d -p '9200:9200' -e 'discovery.type=single-node' -e 'xpack.security.enabled=false' elasticsearch:8.4.2"