forgebox & s3 updates

ortus-boxlang · May 15, 2024 · 473abe1 · 473abe1
1 parent 0f913fd
commit 473abe1
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 53 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Setup CommandBox
         uses: Ortus-Solutions/setup-commandbox@v2.0.1
         with:
-          forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
+          forgeboxAPIKey: ${{ secrets.FORGEBOX_API_TOKEN }}
 
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -118,11 +118,11 @@ jobs:
         with:
           args: --acl public-read
         env:
-          AWS_S3_BUCKET: "ortus-temp"
+          AWS_S3_BUCKET: "downloads.ortussolutions.com"
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
           SOURCE_DIR: "build/distributions"
-          DEST_DIR: "boxlang-modules/${{ env.MODULE_ID }}/${{ env.VERSION }}"
+          DEST_DIR: "ortussolutions/boxlang-modules/${{ env.MODULE_ID }}/${{ env.VERSION }}"
 
       # - name: Upload API Docs to S3
       #   uses: jakejarvis/s3-sync-action@master
@@ -138,6 +138,11 @@ jobs:
       # - name: Publish to Maven Central
       #   run: |
 
+      - name: Publish to ForgeBox
+        run: |
+          cd build/module
+          box forgebox publish --force
+
       - name: Create Github Release
         uses: taiki-e/create-gh-release-action@v1.8.0
         continue-on-error: true

diff --git a/box.json b/box.json
@@ -1,46 +1,48 @@
 {
-    "name":"BoxLang MariaDB",
-    "version":"@build.version@+@build.number@",
-    "location"  : "https://downloads.ortussolutions.com/ortussolutions/boxlang-modules/bx-mariadb/@build.version@/bx-mariadb-@build.version@.zip",
-    "author":"Ortus Solutions",
-    "homepage":"https://github.com/boxlang-modules/bx-mariadb",
-    "documentation":"https://github.com/boxlang-modules/bx-mariadb",
-    "repository":{
-        "type":"git",
-        "URL":"https://github.com/boxlang-modules/bx-mariadb"
-    },
-    "bugs":"https://github.com/boxlang-modules/bx-mariadb/issues",
-    "slug":"bx-mariadb",
-    "shortDescription":"Module template for BoxLang modules",
-    "type":"boxlang-modules",
-    "keywords":[
-        "boxlang"
-    ],
-    "private":false,
-    "license":[
-        {
-            "type":"Apache-2.0",
-            "URL":"https://www.apache.org/licenses/LICENSE-2.0"
-        }
-    ],
-	"devDependencies" 	:{
-		"commandbox-cfformat":"*",
-        "commandbox-docbox":"*",
-		"commandbox-dotenv":"*",
-        "commandbox-cfconfig":"*",
+	"name": "BoxLang MariaDB",
+	"version": "@build.version@+@build.number@",
+	"location": "https://downloads.ortussolutions.com/ortussolutions/boxlang-modules/bx-mariadb/@build.version@/bx-mariadb-@build.version@.zip",
+	"author": "Ortus Solutions",
+	"homepage": "https://github.com/boxlang-modules/bx-mariadb",
+	"documentation": "https://github.com/boxlang-modules/bx-mariadb",
+	"repository": {
+		"type": "git",
+		"URL": "https://github.com/boxlang-modules/bx-mariadb"
+	},
+	"bugs": "https://github.com/boxlang-modules/bx-mariadb/issues",
+	"slug": "bx-mariadb",
+	"shortDescription": "Module template for BoxLang modules",
+	"type": "boxlang-modules",
+	"boxlang": {
+		"moduleName": "mariadb"
+	},
+	"keywords": ["boxlang"],
+	"private": false,
+	"listed": false,
+	"license": [
+		{
+			"type": "Apache-2.0",
+			"URL": "https://www.apache.org/licenses/LICENSE-2.0"
+		}
+	],
+	"devDependencies": {
+		"commandbox-cfformat": "*",
+		"commandbox-docbox": "*",
+		"commandbox-dotenv": "*",
+		"commandbox-cfconfig": "*",
 		"testbox": "*"
 	},
-    "ignore": [
-        "**/.*",
-        "settings.gradle",
-        "gradlew.bat",
-        "gradlew",
-        "build.gradle",
-        "/src/**",
-        "gradle/**"
-    ],
-	"scripts":{
+	"ignore": [
+		"**/.*",
+		"settings.gradle",
+		"gradlew.bat",
+		"gradlew",
+		"build.gradle",
+		"/src/**",
+		"gradle/**"
+	],
+	"scripts": {
 		"setupTemplate": "task run taskFile=src/build/SetupTemplate.cfc",
-        "onRelease":"publish"
-    }
+		"onRelease": "publish"
+	}
 }
diff --git a/build.gradle b/build.gradle
@@ -178,17 +178,19 @@ test {
 
 /**
  * TEMPORARY until we publish to maven
- * Task to download the latest jar from https://ortus-temp.s3.amazonaws.com/jericho/libs/boxlang-1.0.0-all.jar
+ * Task to download the latest jar
  */
 task downloadBoxLang( type: Download ) {
 	// Create the destination directory
 	doFirst {
 		file( "src/test/resources/libs" ).mkdirs()
 	}
-    // Configure the URL of the file to download
-    src "https://ortus-temp.s3.amazonaws.com/jericho/libs/boxlang-${boxlangVersion}-all.jar"
-    // Specify the destination directory for the downloaded file
-    dest "src/test/resources/libs/boxlang-${boxlangVersion}-all.jar"
+	// Configure the URLs of the files to download
+	src([
+		"https://downloads.ortussolutions.com/ortussolutions/boxlang/${boxlangVersion}/boxlang-${boxlangVersion}-all.jar"
+	])
+	// Specify the destination directories for the downloaded files
+	dest "src/test/resources/libs/"
     overwrite true
     onlyIfModified false
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Gradle Properties
-version = 1.0.0
-group = com.ortussolutions
-boxlangVersion = 1.0.0
-jdkVersion = 17
+version=1.0.0
+group=com.ortussolutions
+boxlangVersion=1.0.0
+jdkVersion=17