From 60c6d48dc5182def42d2f9ec60fb672b4a078ec8 Mon Sep 17 00:00:00 2001 From: Lukas Mrtvy Date: Thu, 18 Sep 2025 13:55:35 +0200 Subject: [PATCH 1/5] fix: nginx configuration --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 8aa3113ffd..d6dd839ab0 100644 --- a/nginx.conf +++ b/nginx.conf @@ -422,7 +422,7 @@ server { rewrite ^/academy/get-most-of-actors$ /academy/actor-marketing-playbook permanent; # Misc - ; rewrite ^/platform/integrations/llama$ /platform/integrations/llama-index permanent; + rewrite ^/platform/integrations/llama$ /platform/integrations/llama-index permanent; } From db76e16a432c522d737ff8a716bbe2e6f6767194 Mon Sep 17 00:00:00 2001 From: Lukas Mrtvy Date: Thu, 18 Sep 2025 14:18:30 +0200 Subject: [PATCH 2/5] fix: add nginx test configuration --- .github/workflows/nginx.conf-test.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/nginx.conf-test.yaml diff --git a/.github/workflows/nginx.conf-test.yaml b/.github/workflows/nginx.conf-test.yaml new file mode 100644 index 0000000000..5e6b4eaff7 --- /dev/null +++ b/.github/workflows/nginx.conf-test.yaml @@ -0,0 +1,17 @@ +name: Nginx configuration test + +on: + pull_request: + paths: + - nginx.conf + +jobs: + nginx-test-job: + runs-on: ubuntu-latest + container: + image: nginx:1.29.1-alpine-slim + steps: + - name: Checkout repository + uses: actions/checkout@v5 + - name: Test Nginx configuration + run: nginx -t -c $(pwd)/nginx.conf From e10eca1d67517b1d14d58320f29f4972c18e6b6c Mon Sep 17 00:00:00 2001 From: Lukas Mrtvy Date: Thu, 18 Sep 2025 16:34:00 +0200 Subject: [PATCH 3/5] fix --- .github/workflows/nginx.conf-test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nginx.conf-test.yaml b/.github/workflows/nginx.conf-test.yaml index 5e6b4eaff7..5924b16c20 100644 --- a/.github/workflows/nginx.conf-test.yaml +++ b/.github/workflows/nginx.conf-test.yaml @@ -14,4 +14,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v5 - name: Test Nginx configuration - run: nginx -t -c $(pwd)/nginx.conf + run: | + echo "http { include 'nginx.conf'; }" > default.conf + nginx -t -c $(pwd)/default.conf From 79d9dec46dcb8ca663873913f3b8da8bd541d47d Mon Sep 17 00:00:00 2001 From: Lukas Mrtvy Date: Thu, 18 Sep 2025 16:39:25 +0200 Subject: [PATCH 4/5] fix: explicit image repository --- .github/workflows/nginx.conf-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nginx.conf-test.yaml b/.github/workflows/nginx.conf-test.yaml index 5924b16c20..87f7f97e21 100644 --- a/.github/workflows/nginx.conf-test.yaml +++ b/.github/workflows/nginx.conf-test.yaml @@ -9,7 +9,7 @@ jobs: nginx-test-job: runs-on: ubuntu-latest container: - image: nginx:1.29.1-alpine-slim + image: docker.io/library/nginx:1.28.0-alpine-slim steps: - name: Checkout repository uses: actions/checkout@v5 From 5f897241eaf5aab617d79bef30af084fc6e1b018 Mon Sep 17 00:00:00 2001 From: Lukas Mrtvy Date: Thu, 18 Sep 2025 16:42:18 +0200 Subject: [PATCH 5/5] fix: add events stanza --- .github/workflows/nginx.conf-test.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nginx.conf-test.yaml b/.github/workflows/nginx.conf-test.yaml index 87f7f97e21..328c593de2 100644 --- a/.github/workflows/nginx.conf-test.yaml +++ b/.github/workflows/nginx.conf-test.yaml @@ -15,5 +15,10 @@ jobs: uses: actions/checkout@v5 - name: Test Nginx configuration run: | - echo "http { include 'nginx.conf'; }" > default.conf + cat > default.conf <