updating servlet s3 assets

ortus-boxlang · May 14, 2024 · fb6f1f0 · fb6f1f0
1 parent 609899d
commit fb6f1f0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -113,22 +113,22 @@ 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-runtimes/${{ env.MODULE_ID }}/${{ env.VERSION }}/"
+          DEST_DIR: "ortussolutions/boxlang-runtimes/${{ env.MODULE_ID }}/${{ env.VERSION }}/"
 
-      # - name: Upload API Docs to S3
-      #   uses: jakejarvis/s3-sync-action@master
-      #   with:
-      #     args: --acl public-read
-      #   env:
-      #     AWS_S3_BUCKET: "apidocs.ortussolutions.com"
-      #     AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
-      #     AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
-      #     SOURCE_DIR: "build-coldbox/apidocs"
-      #     DEST_DIR: ""
+      - name: Upload API Docs to S3
+        uses: jakejarvis/s3-sync-action@master
+        with:
+          args: --acl public-read
+        env:
+          AWS_S3_BUCKET: "apidocs.ortussolutions.com"
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
+          SOURCE_DIR: "build/docs/javadoc"
+          DEST_DIR: "boxlang-runtimes/${{ env.MODULE_ID }}/${{ env.VERSION }}/"
 
       # - name: Publish to Maven Central
       #   run: |

diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,8 @@ dependencies {
 	// Until BoxLang is published to Maven Central
 	// Look for it in the local build directory
 	// You must run `./gradle build -x test` in the BoxLang project
-    implementation files( 'src/test/resources/libs/boxlang-1.0.0-all.jar' )
+    implementation files( 'src/test/resources/libs/boxlang-websupport-1.0.0.jar' )
+	implementation files( 'src/test/resources/libs/boxlang-1.0.0-all.jar' )
 
 	// https://mvnrepository.com/artifact/io.undertow/undertow-core/2.2.32.Final
 	compileOnly 'io.undertow:undertow-core:2.2.32.Final'
@@ -228,9 +229,12 @@ task downloadBoxLang( type: Download ) {
 		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"
+    src([
+		"https://ortus-temp.s3.amazonaws.com/jericho/libs/boxlang-${boxlangVersion}-all.jar",
+		"https://downloads.ortussolutions.com/ortussolutions/boxlang-runtimes/boxlang-web-support/${boxlangVersion}/boxlang-web-support-${boxlangVersion}.jar"
+	])
+    // Specify the destination directories for the downloaded files
+    dest "src/test/resources/libs/"
     overwrite true
     onlyIfModified false
 }