Merge branch 'master' into kazuho/compound-packet

Author: kazuho

.circleci/config.yml

@@ -11,22 +11,22 @@ jobs:
       # Prime caches for faster checkout
       - restore_cache:
           keys:
-            - template
+            - git-reference
       - run:
-          name: "Update Template"
-          command: "git -C ~/i-d-template remote update --prune"
+          name: "Update Cache"
+          command: "git -C ~/git-reference fetch --all --prune"
       - save_cache:
-          key: template
+          key: git-reference
           paths:
-            - ~/i-d-template
+            - ~/git-reference
 
       # Build txt and html versions of drafts
       - restore_cache:
           keys:
             - refcache
       - run:
           name: "Build Drafts"
-          command: "make 'CLONE_ARGS=--reference ~/i-d-template'"
+          command: "make 'CLONE_ARGS=--reference ~/git-reference'"
       - save_cache:
           key: refcache
           paths:
@@ -40,15 +40,11 @@ jobs:
       - store_artifacts:
           path: /tmp/artifacts
 
-      # Update gh-pages and gh-issues branches
+      # Update editor's copy on gh-pages
       - run:
           name: "Update GitHub Pages"
           command: "make gh-pages"
 
-      - run:
-          name: "Save Issues"
-          command: "make gh-issues || true"
-
       # For tagged builds, upload to the datatracker.
       - deploy:
           name: "Upload to Datatracker"
@@ -57,6 +53,11 @@ jobs:
               make upload
             fi
 
+      # Save GitHub issues
+      - run:
+          name: "Save GitHub Issues"
+          command: "make issues || make issues DISABLE_ISSUE_FETCH=true && make gh-issues"
+
 workflows:
   version: 2
   build:

Makefile

@@ -1,4 +1,4 @@
-MD_PREPROCESSOR := sed -e 's/{DATE}/$(shell date '+%Y-%m')/g'
+MD_PREPROCESSOR := sed -e 's/{DATE}/$(shell date '+%Y-%m-%d')/g'
 
 LIBDIR := lib
 include $(LIBDIR)/main.mk

README.md

@@ -27,6 +27,12 @@ QUIC protocol suite.
 * [Working Group Draft](https://tools.ietf.org/html/draft-ietf-quic-http)
 * [Compare Working Group Draft and Editor's copy](https://tools.ietf.org/rfcdiff?url1=https://tools.ietf.org/id/draft-ietf-quic-http&url2=https://quicwg.github.io/base-drafts/draft-ietf-quic-http.txt)
 
+## QPACK
+
+* [Editor's copy](https://quicwg.github.io/base-drafts/draft-ietf-quic-qpack.html)
+* [Working Group Draft](https://tools.ietf.org/html/draft-ietf-quic-qpack)
+* [Compare Working Group Draft and Editor's copy](https://tools.ietf.org/rfcdiff?url1=https://tools.ietf.org/id/draft-ietf-quic-qpack&url2=https://quicwg.github.io/base-drafts/draft-ietf-quic-qpack.txt)
+
 ## Building the Draft
 
 Formatted text and HTML versions of the draft can be built using `make`.