From 3afec325061235d0417a4b0e39b4ed5af65639b1 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 14:12:58 +0000 Subject: [PATCH 01/10] Testing if wrangler version 3 fixes headers issue. --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8c92d49..97aba80 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -48,6 +48,7 @@ jobs: projectName: 'agile-gdx' directory: 'html/build/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. From 46c0599cf90fc9bec76e608868366043582f6c49 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 14:30:59 +0000 Subject: [PATCH 02/10] Update cloudflare pages to specifically 1.5.0 --- .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 97aba80..2bfbf68 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,7 +41,7 @@ jobs: rm -rf html/build/dist/WEB-INF - name: Publish to Cloudflare Pages - uses: cloudflare/pages-action@1 + uses: cloudflare/pages-action@1.5.0 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} From 74fdb8b70fe8191902421df2a31b738e6e84763d Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 14:32:32 +0000 Subject: [PATCH 03/10] Trying 1.5 for cloudflare pages action instead --- .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 2bfbf68..ed9555c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,7 +41,7 @@ jobs: rm -rf html/build/dist/WEB-INF - name: Publish to Cloudflare Pages - uses: cloudflare/pages-action@1.5.0 + uses: cloudflare/pages-action@1.5 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} From 5c8eedbdd78f291921573e6f874a0d172ec509e6 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 14:35:17 +0000 Subject: [PATCH 04/10] Setting pages-action page to 1. It appears to be the latest. --- .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 ed9555c..97aba80 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,7 +41,7 @@ jobs: rm -rf html/build/dist/WEB-INF - name: Publish to Cloudflare Pages - uses: cloudflare/pages-action@1.5 + uses: cloudflare/pages-action@1 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} From 423a8864a61fed89fb1c1b1956293874bef48a41 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 16:47:12 +0000 Subject: [PATCH 05/10] An attempt to use wrangler-action instead of pages-action --- .github/workflows/gradle.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 97aba80..86d420c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,14 +41,20 @@ jobs: rm -rf html/build/dist/WEB-INF - name: Publish to Cloudflare Pages - uses: cloudflare/pages-action@1 + uses: cloudflare/wrangler-action@v3 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - projectName: 'agile-gdx' - directory: 'html/build/dist' - gitHubToken: ${{ secrets.GITHUB_TOKEN }} - wranglerVersion: '3' + workingDirectory: 'html/build/dist' + command: pages deploy --project-name='agile-gdx' + #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' # 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. From c71d10e25ede0768c406f544b0729ce98ff0fb03 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 16:51:22 +0000 Subject: [PATCH 06/10] Changed how the directory is passed to wrangler-action --- .github/workflows/gradle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 86d420c..957d2fb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,8 +45,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - workingDirectory: 'html/build/dist' - command: pages deploy --project-name='agile-gdx' + command: pages deploy html/build/dist --project-name='agile-gdx' #uses: cloudflare/pages-action@1 #with: # apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} From 244f38b5739b3c581af55bd0303d9c1ad6217617 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 16:57:51 +0000 Subject: [PATCH 07/10] Changing working dir to dist --- .github/workflows/gradle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 957d2fb..8654cfb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,8 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages deploy html/build/dist --project-name='agile-gdx' + workingDirectory: 'html/build/dist' + command: pages deploy . --project-name='agile-gdx' #uses: cloudflare/pages-action@1 #with: # apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} From e43d51c024ab3f31703657e13cbb5d1af45cc790 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 17:09:22 +0000 Subject: [PATCH 08/10] Update gradle.yml --- .github/workflows/gradle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8654cfb..f9ab10d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,8 +45,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - workingDirectory: 'html/build/dist' - command: pages deploy . --project-name='agile-gdx' + command: pages deploy html/build/dist --project-name='agile-gdx' --commit-dirty=true #uses: cloudflare/pages-action@1 #with: # apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} From 55ebfdb2d71db46effd6b34a8c8ccff84b6341e2 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 17:15:18 +0000 Subject: [PATCH 09/10] Testing if --verbose works with wrangler-action --- .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 f9ab10d..b58b737 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages deploy html/build/dist --project-name='agile-gdx' --commit-dirty=true + command: pages deploy html/build/dist --project-name='agile-gdx' --commit-dirty=true --verbose #uses: cloudflare/pages-action@1 #with: # apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} From 4a3302458e4a2fd9ca04ee885851a9624372f5d7 Mon Sep 17 00:00:00 2001 From: Lance Ewing Date: Thu, 7 Mar 2024 17:19:42 +0000 Subject: [PATCH 10/10] Removing --verbose from wrangler-action. Didn't work. --- .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 b58b737..f9ab10d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages deploy html/build/dist --project-name='agile-gdx' --commit-dirty=true --verbose + command: pages deploy html/build/dist --project-name='agile-gdx' --commit-dirty=true #uses: cloudflare/pages-action@1 #with: # apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}