From f9b314acf2e2b6ea432c20b55959acb79b3f8ef4 Mon Sep 17 00:00:00 2001
From: Lance Ewing <lance.ewing@gmail.com>
Date: Fri, 8 Mar 2024 15:37:27 +0000
Subject: [PATCH 1/4] An attempt to get wrangler to pick up functions folder

---
 .github/workflows/gradle.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f9ab10d..7539e0e 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -39,13 +39,15 @@ jobs:
           chmod u+x gradlew
           ./gradlew html:dist
           rm -rf html/build/dist/WEB-INF
+          mv html/build/dist/functions ..
 
     - name: Publish to Cloudflare Pages
       uses: cloudflare/wrangler-action@v3
       with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy html/build/dist --project-name='agile-gdx' --commit-dirty=true
+          workingDirectory: html/build
+          command: pages deploy dist --project-name='agile-gdx' --commit-dirty=true
       #uses: cloudflare/pages-action@1
       #with:
       #    apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

From 247684ea8db10843aa5ac85e2badf85ee3009438 Mon Sep 17 00:00:00 2001
From: Lance Ewing <lance.ewing@gmail.com>
Date: Fri, 8 Mar 2024 15:43:12 +0000
Subject: [PATCH 2/4] Fixed move of functions folder

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 7539e0e..b081688 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -39,7 +39,7 @@ jobs:
           chmod u+x gradlew
           ./gradlew html:dist
           rm -rf html/build/dist/WEB-INF
-          mv html/build/dist/functions ..
+          mv html/build/dist/functions html/build
 
     - name: Publish to Cloudflare Pages
       uses: cloudflare/wrangler-action@v3

From e1a299a246feeffe6daa93607f5dcc75f22127fe Mon Sep 17 00:00:00 2001
From: Lance Ewing <lance.ewing@gmail.com>
Date: Fri, 8 Mar 2024 15:51:30 +0000
Subject: [PATCH 3/4] Dummy update to test settings change.

---
 .github/workflows/gradle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b081688..baad3dd 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -48,6 +48,7 @@ jobs:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           workingDirectory: html/build
           command: pages deploy dist --project-name='agile-gdx' --commit-dirty=true
+          
       #uses: cloudflare/pages-action@1
       #with:
       #    apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

From 8da7bcd373dbe0b107e65651a9db1a02682ca96f Mon Sep 17 00:00:00 2001
From: Lance Ewing <lance.ewing@gmail.com>
Date: Fri, 8 Mar 2024 22:14:07 +0000
Subject: [PATCH 4/4] Switching back to pages-action

---
 .github/workflows/gradle.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index baad3dd..3f20611 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -42,21 +42,21 @@ jobs:
           mv html/build/dist/functions html/build
 
     - name: Publish to Cloudflare Pages
-      uses: cloudflare/wrangler-action@v3
+      #uses: cloudflare/wrangler-action@v3
+      #with:
+      #    apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+      #    accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+      #    workingDirectory: html/build
+      #    command: pages deploy dist --project-name='agile-gdx' --commit-dirty=true
+      uses: cloudflare/pages-action@1
       with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          projectName: 'agile-gdx'
           workingDirectory: html/build
-          command: pages deploy dist --project-name='agile-gdx' --commit-dirty=true
-          
-      #uses: cloudflare/pages-action@1
-      #with:
-      #    apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-      #    accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      #    projectName: 'agile-gdx'
-      #    directory: 'html/build/dist'
-      #    gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-      #    wranglerVersion: '3'
+          directory: dist
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          wranglerVersion: '3'
 
     # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
     # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.