synced to latest, resolved conflict

.circleci/config.yml

@@ -6,20 +6,38 @@ jobs:
     working_directory: ~/draft
 
     steps:
+      - run:
+          name: "Print Configuration"
+          command: |
+            xml2rfc --version
+            gem list -q kramdown-rfc2629
+            echo -n 'mmark '; mmark --version
+
       - restore_cache:
           name: "Restoring cache - Git"
           keys:
-            - v1-cache-git-{{ .Branch }}-{{ .Revision }}
-            - v1-cache-git-{{ .Branch }}
-            - v1-cache-git-master
-            - v1-cache-git-
+            - v2-cache-git-{{ .Branch }}-{{ .Revision }}
+            - v2-cache-git-{{ .Branch }}
+            - v2-cache-git-master
+            - v2-cache-git-
 
       - restore_cache:
           name: "Restoring cache - References"
           keys:
             - v1-cache-references-{{ epoch }}
             - v1-cache-references-
 
+      # Workaround for https://discuss.circleci.com/t/22437
+      - run:
+          name: Tag Checkout
+          command: |
+            if [ -n "$CIRCLE_TAG" ] && [ -d .git ]; then
+              remote=$(echo "$CIRCLE_REPOSITORY_URL" | \
+                       sed -e 's,/^git.github.com:,https://github.com/,')
+              git fetch -f "$remote" "refs/tags/$CIRCLE_TAG:refs/tags/$CIRCLE_TAG" || \
+                (echo 'Removing .git cache for tag build'; rm -rf .git)
+            fi
+
       - checkout
 
       # Build txt and html versions of drafts
@@ -31,15 +49,15 @@ jobs:
       - run:
           name: "Update GitHub Pages"
           command: |
-            if [ "${CIRCLE_TAG#draft-}" == "${CIRCLE_TAG}" ]; then
+            if [ "${CIRCLE_TAG#draft-}" == "$CIRCLE_TAG" ]; then
               make gh-pages
             fi
 
       # For tagged builds, upload to the datatracker.
       - deploy:
           name: "Upload to Datatracker"
           command: |
-            if [ "${CIRCLE_TAG#draft-}" != "${CIRCLE_TAG}" ]; then
+            if [ "${CIRCLE_TAG#draft-}" != "$CIRCLE_TAG" ]; then
               make upload
             fi
 
@@ -62,16 +80,17 @@ jobs:
 
       - save_cache:
           name: "Saving Cache - Git"
-          key: v1-cache-git-{{ .Branch }}-{{ .Revision }}
+          key: v2-cache-git-{{ .Branch }}-{{ .Revision }}
           paths:
-            - ~/draft
+            - ~/draft/.git
 
       - save_cache:
           name: "Saving Cache - Drafts"
           key: v1-cache-references-{{ epoch }}
           paths:
             - ~/.cache/xml2rfc
 
+
 workflows:
   version: 2
   build:

CONTRIBUTING.md

@@ -86,11 +86,6 @@ When a new draft is published, the design issues that have been closed since the
 
 When a design issue is `closed`, it implies that the issue has a proposed resolution that is reflected in the drafts; if a `closed` design issue is labeled with `has-consensus`, it means that the incorporated resolution has Working Group consensus.
 
-The drafts currently in the early stage are:
-
-* HTTP/3
-* QPACK
-* Recovery
 
 
 ### Late-Stage Process
@@ -106,6 +101,9 @@ The drafts currently in the late stage are:
 * Invariants
 * Transport
 * TLS
+* HTTP/3
+* QPACK
+* Recovery
 
 ![diagram of the late stage workflow](workflow.png "Late Stage Workflow")