Merge branch 'master' of https://github.com/lucee/extension-s3

lucee · Jun 17, 2024 · b5895a6 · b5895a6
2 parents 39b4160 + f0e01b1
commit b5895a6
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 13 deletions.
diff --git a/.github/workflows/main-5.4.yml b/.github/workflows/main-5.4.yml
@@ -18,31 +18,31 @@ jobs:
        ports:
         - 9000:9000
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'adopt'
     - name: Cache Maven packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: lucee-s3-maven-cache
     - name: Cache Lucee files
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
         key: lucee-downloads
     - name: Build extension-s3 with Ant
       run: ant -noinput -verbose -buildfile build.xml
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: s3-lex
         path: dist/*.lex
     - name: Checkout Lucee
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: lucee/lucee
         path: lucee

diff --git a/.github/workflows/main-6.0.yml b/.github/workflows/main-6.0.yml
@@ -0,0 +1,78 @@
+# This workflow will build a Java project with Ant
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant
+
+name: Java CI - Lucee 6.0
+
+on: [push, pull_request,workflow_dispatch]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      luceeVersion: light-5.4.2.4-SNAPSHOT
+      luceeVersionQuery: 6.0/all/light
+    services:
+      minio:
+       image: fclairamb/minio-github-actions
+       ports:
+        - 9000:9000
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2
+        key: lucee-s3-maven-cache
+    - name: Cache Lucee files
+      uses: actions/cache@v4
+      with:
+        path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
+        key: lucee-downloads
+    - name: Build extension-s3 with Ant
+      run: ant -noinput -verbose -buildfile build.xml
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: s3-lex
+        path: dist/*.lex
+    - name: Checkout Lucee
+      uses: actions/checkout@v4
+      with:
+        repository: lucee/lucee
+        path: lucee
+    - name: Run Lucee Test Suite, labels="s3"
+      uses: lucee/script-runner@main
+      with:
+        webroot: ${{ github.workspace }}/lucee/test
+        execute: /bootstrap-tests.cfm
+        luceeVersion: ${{ env.luceeVersion }}
+        luceeVersionQuery: ${{ env.luceeVersionQuery }}
+        extensionDir: ${{ github.workspace }}/dist
+      env:
+        testLabels: s3
+        testAdditional: ${{ github.workspace }}/tests
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_ID_TEST }}
+        S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY_TEST }}
+        S3_BUCKET_PREFIX: lucee-ldev-e-
+        S3_CUSTOM_ACCESS_KEY_ID: "minioadmin"
+        S3_CUSTOM_SECRET_KEY: "minioadmin"
+        S3_CUSTOM_HOST: "localhost:9000"
+        S3_CUSTOM_BUCKET_PREFIX: lucee-ldev-e-
+        S3_BACKBLAZE_ACCESS_KEY_ID: 005a56c2ce399e70000000001
+        S3_BACKBLAZE_SECRET_KEY: ${{ secrets.S3_BACKBLAZE_SECRET_KEY }}
+        S3_BACKBLAZE_HOST: s3.us-east-005.backblazeb2.com
+        S3_BACKBLAZE_BUCKET_PREFIX: lucee-ldev-e-
+        S3_WASABI_ACCESS_KEY_ID: JM8VC29WSODA1DRT2H4Y
+        S3_WASABI_SECRET_KEY: ${{ secrets.S3_WASABI_SECRET_KEY }}
+        S3_WASABI_HOST: s3.eu-central-1.wasabisys.com
+        S3_WASABI_BUCKET_PREFIX: lucee-ldev-e-
+        S3_GOOGLE_ACCESS_KEY_ID: ${{ secrets.S3_GOOGLE_ACCESS_KEY_ID }}
+        S3_GOOGLE_SECRET_KEY: ${{ secrets.S3_GOOGLE_SECRET_KEY }}
+        S3_GOOGLE_HOST: storage.googleapis.com
+        S3_GOOGLE_BUCKET_PREFIX: lucee-ldev-e-
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Ant
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant
 
-name: Java CI
+name: Java CI 6.1
 
 on: [push, pull_request,workflow_dispatch]
 
@@ -18,31 +18,31 @@ jobs:
        ports:
         - 9000:9000
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'adopt'
     - name: Cache Maven packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: lucee-s3
     - name: Cache Lucee files
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
         key: lucee-downloads
     - name: Build extension-s3 with Ant
       run: ant -noinput -verbose -buildfile build.xml
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: s3-lex
         path: dist/*.lex
     - name: Checkout Lucee
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: lucee/lucee
         path: lucee