From d1309d3ed8477260a8edfede029d45a931984ff3 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Fri, 12 Mar 2021 18:12:22 +0900
Subject: [PATCH] CI: Switch to https://github.com/w3c/spec-prod
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current CI setup seems to not be working. This change switches it
over to https://github.com/w3c/spec-prod, which is what we’re now using
for the other WebAppSec repos/specs.
---
 .github/workflows/build-validate-publish.yml | 20 ++++++++++++++++++
 .github/workflows/build.yml                  | 22 --------------------
 2 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/build-validate-publish.yml
 delete mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build-validate-publish.yml b/.github/workflows/build-validate-publish.yml
new file mode 100644
index 0000000..3dd9df6
--- /dev/null
+++ b/.github/workflows/build-validate-publish.yml
@@ -0,0 +1,20 @@
+name: CI
+on:
+  pull_request: {}
+  push:
+    branches: [main]
+
+jobs:
+  main:
+    name: Build, Validate, and Publish
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: w3c/spec-prod@v2
+        with:
+          SOURCE: index.src.html
+          TOOLCHAIN: bikeshed
+          GH_PAGES_BRANCH: gh-pages
+          BUILD_FAIL_ON: nothing
+          VALIDATE_LINKS: false
+          VALIDATE_MARKUP: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 942b358..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Build
-on:
-  pull_request:
-    branches:
-    - master
-  push:
-    branches:
-    - master
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: make ci
-    - name: Deploy
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./out