From c1b33ec4a327b4d970e3040bce717d9317fd7394 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 5 Aug 2025 19:13:54 +0000 Subject: [PATCH 1/4] Initial plan From fe1e399d8df068d581fa79e22d66eb4990eea151 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 5 Aug 2025 19:20:59 +0000 Subject: [PATCH 2/4] Add PR validation workflow for Zola build Co-authored-by: madolson <34459052+madolson@users.noreply.github.com> --- .github/workflows/pr-validate.yml | 60 +++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .github/workflows/pr-validate.yml diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml new file mode 100644 index 00000000..efa9c28b --- /dev/null +++ b/.github/workflows/pr-validate.yml @@ -0,0 +1,60 @@ +name: Validate PR Build + +on: + pull_request: + branches: ["main"] + +permissions: + contents: read + +jobs: + validate-build: + runs-on: ubuntu-latest + steps: + - name: Checkout PR + uses: actions/checkout@v4 + with: + path: website + + - name: Checkout valkey-doc + uses: actions/checkout@v4 + with: + repository: valkey-io/valkey-doc + path: valkey-doc + + - name: Checkout valkey + uses: actions/checkout@v4 + with: + repository: valkey-io/valkey + path: valkey + + - name: Checkout valkey-bloom + uses: actions/checkout@v4 + with: + repository: valkey-io/valkey-bloom + path: valkey-bloom + + - name: Checkout valkey-search + uses: actions/checkout@v4 + with: + repository: valkey-io/valkey-search + path: valkey-search + + - name: Checkout valkey-json + uses: actions/checkout@v4 + with: + repository: valkey-io/valkey-json + path: valkey-json + + - name: Init commands, topics and clients + run: | + cd website + ./build/init-topics-and-clients.sh ../valkey-doc/topics ../valkey-doc/clients + ./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands ../valkey-json/src/commands ../valkey-search/src/commands + + - name: Build and validate + uses: shalzz/zola-deploy-action@v0.19.1 + env: + BUILD_DIR: website + BUILD_ONLY: true + BUILD_THEMES: false \ No newline at end of file From cc69e5b0d959511fe44de3eb43db65e77b7a329c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 5 Aug 2025 19:28:09 +0000 Subject: [PATCH 3/4] Merge PR validation into zola-deploy workflow Co-authored-by: madolson <34459052+madolson@users.noreply.github.com> --- .github/workflows/pr-validate.yml | 60 ------------------------------- .github/workflows/zola-deploy.yml | 10 ++++-- 2 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/pr-validate.yml diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml deleted file mode 100644 index efa9c28b..00000000 --- a/.github/workflows/pr-validate.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Validate PR Build - -on: - pull_request: - branches: ["main"] - -permissions: - contents: read - -jobs: - validate-build: - runs-on: ubuntu-latest - steps: - - name: Checkout PR - uses: actions/checkout@v4 - with: - path: website - - - name: Checkout valkey-doc - uses: actions/checkout@v4 - with: - repository: valkey-io/valkey-doc - path: valkey-doc - - - name: Checkout valkey - uses: actions/checkout@v4 - with: - repository: valkey-io/valkey - path: valkey - - - name: Checkout valkey-bloom - uses: actions/checkout@v4 - with: - repository: valkey-io/valkey-bloom - path: valkey-bloom - - - name: Checkout valkey-search - uses: actions/checkout@v4 - with: - repository: valkey-io/valkey-search - path: valkey-search - - - name: Checkout valkey-json - uses: actions/checkout@v4 - with: - repository: valkey-io/valkey-json - path: valkey-json - - - name: Init commands, topics and clients - run: | - cd website - ./build/init-topics-and-clients.sh ../valkey-doc/topics ../valkey-doc/clients - ./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands ../valkey-json/src/commands ../valkey-search/src/commands - - - name: Build and validate - uses: shalzz/zola-deploy-action@v0.19.1 - env: - BUILD_DIR: website - BUILD_ONLY: true - BUILD_THEMES: false \ No newline at end of file diff --git a/.github/workflows/zola-deploy.yml b/.github/workflows/zola-deploy.yml index e6493e30..3cd52850 100644 --- a/.github/workflows/zola-deploy.yml +++ b/.github/workflows/zola-deploy.yml @@ -3,6 +3,8 @@ name: Deploy website on: push: branches: ["main"] + pull_request: + branches: ["main"] repository_dispatch: types: [deploy] workflow_dispatch: @@ -16,10 +18,10 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout prod + - name: Checkout uses: actions/checkout@v4 with: - ref: main + ref: ${{ github.event_name == 'pull_request' && github.head_ref || 'main' }} path: website - name: Checkout valkey-doc @@ -64,11 +66,15 @@ jobs: BUILD_DIR: website BUILD_ONLY: true BUILD_THEMES: false + - name: Upload artifact + if: github.event_name != 'pull_request' uses: actions/upload-pages-artifact@v3 with: path: ./website/public + deploy: + if: github.event_name != 'pull_request' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} From 3f05b9602b2eac8129a4f57940371d05344a4098 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 5 Aug 2025 19:29:35 +0000 Subject: [PATCH 4/4] Fix YAML formatting and indentation issues Co-authored-by: madolson <34459052+madolson@users.noreply.github.com> --- .github/workflows/zola-deploy.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/zola-deploy.yml b/.github/workflows/zola-deploy.yml index 3cd52850..985f11f5 100644 --- a/.github/workflows/zola-deploy.yml +++ b/.github/workflows/zola-deploy.yml @@ -21,7 +21,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - ref: ${{ github.event_name == 'pull_request' && github.head_ref || 'main' }} + ref: >- + ${{ github.event_name == 'pull_request' && + github.head_ref || 'main' }} path: website - name: Checkout valkey-doc @@ -39,26 +41,29 @@ jobs: - name: Checkout valkey-bloom uses: actions/checkout@v4 with: - repository: valkey-io/valkey-bloom - path: valkey-bloom + repository: valkey-io/valkey-bloom + path: valkey-bloom - name: Checkout valkey-search uses: actions/checkout@v4 with: - repository: valkey-io/valkey-search - path: valkey-search + repository: valkey-io/valkey-search + path: valkey-search - name: Checkout valkey-json uses: actions/checkout@v4 with: - repository: valkey-io/valkey-json - path: valkey-json + repository: valkey-io/valkey-json + path: valkey-json - name: Init commands, topics and clients run: | cd website - ./build/init-topics-and-clients.sh ../valkey-doc/topics ../valkey-doc/clients - ./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands ../valkey-json/src/commands ../valkey-search/src/commands + ./build/init-topics-and-clients.sh ../valkey-doc/topics \ + ../valkey-doc/clients + ./build/init-commands.sh ../valkey-doc/commands \ + ../valkey/src/commands ../valkey-bloom/src/commands \ + ../valkey-json/src/commands ../valkey-search/src/commands - name: Build only uses: shalzz/zola-deploy-action@v0.19.1 @@ -66,13 +71,13 @@ jobs: BUILD_DIR: website BUILD_ONLY: true BUILD_THEMES: false - + - name: Upload artifact if: github.event_name != 'pull_request' uses: actions/upload-pages-artifact@v3 with: path: ./website/public - + deploy: if: github.event_name != 'pull_request' environment: