diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
new file mode 100644
index 00000000..d103d5b9
--- /dev/null
+++ b/.github/workflows/compile.yml
@@ -0,0 +1,50 @@
+name: Process Builder
+
+# Reference documentation: https://docs.github.com/en/actions/reference
+on: [push, pull_request]
+
+jobs:
+ deploy:
+ runs-on: ubuntu-20.04
+ name: Build and deploy to gh-pages
+ if: ${{ github.repository == 'w3c/w3process' && github.event_name == 'push' }}
+ env:
+ GITHUB_TOKEN: ${{ secrets.W3CGRUNTBOT_TOKEN }}
+ GH_BRANCH: ${{ github.head_ref }}
+ GH_EVENT_NUMBER: ${{ github.event.number }}
+ steps:
+ - name: Checkout the repository
+ uses: actions/checkout@v2
+ - name: Setup python 3.8
+ uses: actions/setup-python@v2
+ with:
+ python-version: 3.8
+ architecture: x64
+ - name: Install bikeshed
+ run: |
+ pip install bikeshed
+ bikeshed update
+ echo Bikeshed is ready
+ - name: invoke deploy.sh
+ run: ./deploy.sh
+ shell: bash
+ build:
+ runs-on: ubuntu-20.04
+ name: Check that the Process builds cleanly
+ if: ${{ github.repository != 'w3c/w3process' || github.event_name == 'pull_request' }}
+ steps:
+ - name: Checkout the repository
+ uses: actions/checkout@v2
+ - name: Setup python 3.8
+ uses: actions/setup-python@v2
+ with:
+ python-version: 3.8
+ architecture: x64
+ - name: Install bikeshed
+ run: |
+ pip install bikeshed
+ bikeshed update
+ echo Bikeshed is ready
+ - name: invoke compile.sh
+ run: ./compile.sh
+ shell: bash
diff --git a/.pr-preview.json b/.pr-preview.json
new file mode 100644
index 00000000..49b06777
--- /dev/null
+++ b/.pr-preview.json
@@ -0,0 +1,4 @@
+{
+ "src_file": "index.bs",
+ "type": "bikeshed"
+}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a51d4984..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: python
-sudo: false
-python:
- - "3.7"
-
-install:
- - pip install bikeshed
- - bikeshed update
-
-script:
- - bash ./deploy.sh
-
-env:
- global:
- - ENCRYPTION_LABEL: "3ed1c8db88ff"
- - COMMIT_AUTHOR_EMAIL: "public-w3process@w3.org"
diff --git a/README.md b/README.md
index 23883c4e..72b8cb36 100644
--- a/README.md
+++ b/README.md
@@ -5,65 +5,23 @@ This repository is for the editor's draft of the [World Wide Web Consortium Proc
The Process document is updated most years by the W3C.
Discussion happens in the context of the W3C Process Community Group
-[https://www.w3.org/community/w3process/](https://www.w3.org/community/w3process/).
-
-The editor's draft can be viewed at [https://w3c.github.io/w3process/](https://w3c.github.io/w3process/).
-
-The Process being prepared for release in 2020
-includes a singificant number of large changes,
-which can be broadly categorized into:
-* A convertion of the document from plain HTML to the bikeshed specification preprocessor
- (mostly just markup changes,
- some editorial changes)
-* Miscellaneous fixes, some editorial, some small, some medium
-* A reorganization of section 6,
- to disentangle definitions of maturities from transition between states
- (editorial)
-* Significant revisions and additions to the Recommendation Track
-* A few final tweaks based on comments gathered during the AC Review Period
-
-As some of these changes overlap,
-in order to facilitate review,
-the following snapshots of various stages of the evolution have been prepared,
-as well as diffs between these various stages.
-
-
+[https://www.w3.org/community/w3process/](https://www.w3.org/community/w3process/), mostly in this Github repository, but also on the archived public mailing list.
----
## Branches under development
-[master](https://github.com/w3c/w3process/tree/master) branch:
-[](https://travis-ci.com/w3c/w3process) /
-[Preview](https://w3c.github.io/w3process/)
+[main](https://github.com/w3c/w3process/tree/main) branch:
+[Preview](https://www.w3.org/Consortium/Process/Drafts/)
-[maintenance-2020](https://github.com/w3c/w3process/tree/maintenance-2020) branch:
-[](https://travis-ci.com/w3c/w3process) /
-[Preview](https://w3c.github.io/w3process/maintenance-2020) /
-[Diff](https://services.w3.org/htmldiff?doc1=https%3A%2F%2Fw3c.github.io%2Fw3process%2F&doc2=https%3A%2F%2Fw3c.github.io%2Fw3process%2Fmaintenance-2020)
+[director-free](https://github.com/w3c/w3process/tree/director-free) branch:
+[Preview](https://www.w3.org/Consortium/Process/Drafts/director-free/) /
+[Diff](https://services.w3.org/htmldiff?doc1=https%3A%2F%2Fwww.w3.org%2FConsortium%2FProcess%2FDrafts%2F&doc2=https%3A%2F%2Fwww.w3.org%2FConsortium%2FProcess%2FDrafts%2Fdirector-free)
+----
+## Useful searches
-[director-free](https://github.com/w3c/w3process/tree/director-free) branch:
-[](https://travis-ci.com/w3c/w3process) /
-[Preview](https://w3c.github.io/w3process/director-free/) /
-[Diff](https://services.w3.org/htmldiff?doc1=https%3A%2F%2Fw3c.github.io%2Fw3process%2F&doc2=https%3A%2F%2Fw3c.github.io%2Fw3process%2Fdirector-free)
+[PRs triaged into P2021](https://github.com/w3c/w3process/issues?q=is%3Aopen+-label%3A%22P2021%3A+Priority%22+milestone%3A%22Process+2021%22+) which are not priorities.
-[registries](https://github.com/w3c/w3process/tree/registries) branch:
-[](https://travis-ci.com/w3c/w3process) /
-[Preview](https://w3c.github.io/w3process/registries) /
-[Diff](https://services.w3.org/htmldiff?doc1=https%3A%2F%2Fw3c.github.io%2Fw3process%2F&doc2=https%3A%2F%2Fw3c.github.io%2Fw3process%2Fregistries)
----
## Bikeshed
@@ -84,23 +42,24 @@ Once Bikeshed is installed, just type `bikeshed` to compile the document.
To set up long-lived topic branches which get built server side and published to github.io,
follow these steps:
-1. **On the master branch** edit deploy.sh to add the name of your topic branch to the `TOPIC_BRANCHES` array. Example:
+1. **On the main branch** edit deploy.sh to add the name of your topic branch to the `TOPIC_BRANCHES` array. Example:
```bash
TOPIC_BRANCHES=("topic1" "topic2" "topic3")
```
-2. (Optional Step) Edit the README.md file to add a "Build Status" line for your topic branch.
- See the existing "Build Status" for the master branch as a model.
+2. (Optional Step) Edit the README.md file to line for your topic branch.
+ See the "Branches under development" section and use existing branches as a model.
+
3. Commit the change(s) above, and push to github.com/w3c/w3process (not your personal fork). Example:
```bash
git add deploy.sh README.md
git commit -m "Register topic branch for topic3"
- git push upstream master
+ git push upstream main
```
-4. Create a new branch from the master branch (after the previous commit), using the same name as the one you used in the `TOPIC_BRANCHES` array, and push it to github.com/w3process (not your personal fork). Example:
+4. Create a new branch from the main branch (after the previous commit), using the same name as the one you used in the `TOPIC_BRANCHES` array, and push it to github.com/w3process (not your personal fork). Example:
```bash
git checkout -b topic3
diff --git a/copyright.include b/copyright.include
deleted file mode 100644
index 87e3b24f..00000000
--- a/copyright.include
+++ /dev/null
@@ -1,11 +0,0 @@
-Copyright © 1996-[YEAR]
-W3C®
-(MIT,
-ERCIM,
-Keio, Beihang), All Rights Reserved. W3C
-liability,
-trademark,
-document use and
-software licensing rules apply. Your interactions
-with this site are in accordance with our public and
-Member privacy statements.
diff --git a/deploy.sh b/deploy.sh
index 66ace059..89bf6dd7 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,11 +1,27 @@
#!/bin/bash
set -e # Exit with nonzero exit code if anything fails
-SOURCE_BRANCH="master"
+SOURCE_BRANCH="main"
TARGET_BRANCH="gh-pages"
# List of long-lived topic branch names to be published on github.io as a subdirectory
-TOPIC_BRANCHES=("director-free" "registries" "maintenance-2020")
+# Once added, branches should not be removed from here,
+# because cool URLs don't change.
+# (But you can stop advertising them in README.md)
+# Even if the branch itself is retired,
+# the built copies will continue to be served unless and until its name is removed from here.
+TOPIC_BRANCHES=(
+ "director-free"
+ "tooling"
+ "registries"
+ "registries-on-rec-track"
+ "registries-separable"
+ "evergreen"
+ "everblue"
+ "section-6-clean-up"
+ "maintenance-2020"
+ "p2021-before-reorg"
+ "p2021")
containsElement () {
local e match="$1"
@@ -17,6 +33,20 @@ containsElement () {
# So we can see what we're doing
set -x
+# set up the github credentials
+
+git config --global user.email 87540780+w3cgruntbot@users.noreply.github.com
+git config --global user.name w3cgruntbot
+git config --global user.password $GITHUB_TOKEN
+
+REPO_URL="https://w3cbot:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git"
+
+# set up old travis env
+
+TRAVIS_BRANCH=${GH_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')}
+TRAVIS_PULL_REQUEST=${GH_EVENT_NUMBER:-false}
+
+
# Pull requests and commits to other branches shouldn't try to deploy, just build to verify
if [ "$TRAVIS_PULL_REQUEST" != "false" ] || { [ "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ] && ! containsElement "$TRAVIS_BRANCH" "${TOPIC_BRANCHES[@]}" ; }; then
echo "Skipping deploy; just doing a build."
@@ -24,14 +54,9 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ] || { [ "$TRAVIS_BRANCH" != "$SOURCE_BR
exit 0
fi
-# Save some useful information
-REPO=`git config remote.origin.url`
-SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
-SHA=`git rev-parse --verify HEAD`
-
# Clone the existing gh-pages for this repo into out/
-# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deply)
-git clone $REPO out
+# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deploy)
+git clone $REPO_URL out
cd out
git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH
git reset --hard
@@ -58,8 +83,6 @@ fi
# Now let's go have some fun with the cloned repo
cd out
-git config user.name "Travis CI"
-git config user.email "$COMMIT_AUTHOR_EMAIL"
# If there are no changes to the compiled out (e.g. this is a README update) then just bail.
if [[ -z $(git status --porcelain) ]]; then
@@ -70,17 +93,8 @@ fi
# Commit the "changes", i.e. the new version.
# The delta will show diffs between new and old versions.
git add -A .
-git commit -m "Deploy to GitHub Pages: ${SHA} from branch \"${TRAVIS_BRANCH}\""
-
-# Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc
-ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
-ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
-ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
-ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in ../deploy_key.enc -out ../deploy_key -d
-chmod 600 ../deploy_key
-eval `ssh-agent -s`
-ssh-add ../deploy_key
+git commit -m ":robot: Deploy to GitHub Pages: ${GITHUB_SHA} from branch \"${TRAVIS_BRANCH}\""
+
# Now that we're all set up, we can push.
-git push $SSH_REPO $TARGET_BRANCH
+git push $REPO_URL $TARGET_BRANCH
diff --git a/deploy_key.enc b/deploy_key.enc
deleted file mode 100644
index 3e1eaedc..00000000
Binary files a/deploy_key.enc and /dev/null differ
diff --git a/footer.include b/footer.include
deleted file mode 100644
index dc4f4b45..00000000
--- a/footer.include
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-