From 2ef67d6a0257468e27fa0cfe5468806d097f7aca Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 12:00:59 +0000 Subject: [PATCH 1/8] Add cloudflare to requirements --- settings.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.ini b/settings.ini index 083b813..0826160 100644 --- a/settings.ini +++ b/settings.ini @@ -5,7 +5,7 @@ version = 0.0.4 min_python = 3.7 license = apache2 black_formatting = False -requirements = fastcore httpx +requirements = fastcore httpx cloudflare doc_path = _docs lib_path = fastcaddy nbs_path = nbs From 858d094f59a86da453a538ce64662bd786ad9f38 Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 12:40:51 +0000 Subject: [PATCH 2/8] Add xcaddy and cloudflare steps to test build workflow --- .github/workflows/test.yaml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5608592..1f482f4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -4,4 +4,28 @@ on: [workflow_dispatch, pull_request, push] jobs: test: runs-on: ubuntu-latest - steps: [uses: fastai/workflows/nbdev-ci@master] + steps: + - name: Install Go + uses: actions/setup-go@v4 + with: + go-version: '>=1.21.0' + + - name: Install xcaddy + run: go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest + + - name: Build caddy with cloudflare plugin + run: | + cd ~/go/bin + ./xcaddy build --with github.com/caddy-dns/cloudflare + + - name: Start caddy for testing + run: | + ~/go/bin/caddy run & + sleep 5 # Give caddy time to start + + - name: Run nbdev tests + uses: fastai/workflows/nbdev-ci@master + + - name: Stop caddy + run: pkill caddy + From ed425735b2cb98507a47f3049646fa0198302517 Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 12:50:09 +0000 Subject: [PATCH 3/8] Add rich to requirements --- settings.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.ini b/settings.ini index 0826160..4b28b1b 100644 --- a/settings.ini +++ b/settings.ini @@ -5,7 +5,7 @@ version = 0.0.4 min_python = 3.7 license = apache2 black_formatting = False -requirements = fastcore httpx cloudflare +requirements = fastcore httpx cloudflare rich doc_path = _docs lib_path = fastcaddy nbs_path = nbs From b182c9da4e0e8e0c2117d31793dc1c7ebe81403d Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 12:54:59 +0000 Subject: [PATCH 4/8] Add dummy CLOUDFLARE_API_TOKEN environment variable to test CI workflow --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1f482f4..b43c4de 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -24,6 +24,8 @@ jobs: sleep 5 # Give caddy time to start - name: Run nbdev tests + env: + CLOUDFLARE_API_TOKEN: DUMMY_TOKEN uses: fastai/workflows/nbdev-ci@master - name: Stop caddy From ee7b170a73a32fb4d0f9269be4bb5ad3a003a095 Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 13:20:06 +0000 Subject: [PATCH 5/8] Skip nbdev tests in CI workflow for now, to test rest of workflow --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b43c4de..9eb8d7e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,6 +27,8 @@ jobs: env: CLOUDFLARE_API_TOKEN: DUMMY_TOKEN uses: fastai/workflows/nbdev-ci@master + with: + skip_test: true - name: Stop caddy run: pkill caddy From 8ce040f1ebf6aa20f63fd17bda496f42542753fb Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 13:23:45 +0000 Subject: [PATCH 6/8] Update test CI workflow to skip index.ipynb during nbdev_test --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9eb8d7e..316b1dc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,7 @@ jobs: CLOUDFLARE_API_TOKEN: DUMMY_TOKEN uses: fastai/workflows/nbdev-ci@master with: - skip_test: true + flags: "--skip_file_re index.ipynb" - name: Stop caddy run: pkill caddy From fe2d5e4874f4feb6f3127e20fcba69ac5259564f Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 13:33:44 +0000 Subject: [PATCH 7/8] Skip `index|test_` for now --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 316b1dc..0fe0ab5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,7 @@ jobs: CLOUDFLARE_API_TOKEN: DUMMY_TOKEN uses: fastai/workflows/nbdev-ci@master with: - flags: "--skip_file_re index.ipynb" + flags: "--skip_file_re 'index|test_" - name: Stop caddy run: pkill caddy From 765ecb812d11f180f51af4f0884be9d36132ed26 Mon Sep 17 00:00:00 2001 From: "Audrey M. Roy Greenfeld" Date: Wed, 26 Feb 2025 13:36:30 +0000 Subject: [PATCH 8/8] Use escaped double quotes in CI flags --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0fe0ab5..36825e9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,7 @@ jobs: CLOUDFLARE_API_TOKEN: DUMMY_TOKEN uses: fastai/workflows/nbdev-ci@master with: - flags: "--skip_file_re 'index|test_" + flags: "--skip_file_re \"index|test_\"" - name: Stop caddy run: pkill caddy