Merge branch 'mlswg:main' into twal/init_key

mlswg · Nov 5, 2024 · 2a8c7ac · 2a8c7ac
2 parents 7f551b5 + b8893e0
commit 2a8c7ac
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml
@@ -20,40 +20,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: "Cache Setup"
-      id: cache-setup
-      run: |
-        mkdir -p "$HOME"/.cache/xml2rfc
-        echo "::set-output name=path::$HOME/.cache/xml2rfc"
-        date -u "+::set-output name=date::%FT%T"
+    - name: "Setup"
+      id: setup
+      run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"
 
-    - name: "Cache References"
-      uses: actions/cache@v2
+    - name: "Caching"
+      uses: actions/cache@v4
       with:
-        path: ${{ steps.cache-setup.outputs.path }}
-        key: refcache-${{ steps.cache-setup.outputs.date }}
-        restore-keys: |
-          refcache-${{ steps.cache-setup.outputs.date }}
-          refcache-
+        path: |
+          .refcache
+          .venv
+          .gems
+          node_modules
+          .targets.mk
+        key: i-d-${{ steps.setup.outputs.date }}
+        restore-keys: i-d-
 
     - name: "Build Drafts"
       uses: martinthomson/i-d-template@v1
+      with:
+        token: ${{ github.token }}
 
     - name: "Update GitHub Pages"
       uses: martinthomson/i-d-template@v1
       if: ${{ github.event_name == 'push' }}
       with:
         make: gh-pages
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: "Save HTML"
-      uses: actions/upload-artifact@v2
-      with:
-        path: "*.html"
+        token: ${{ github.token }}
 
-    - name: "Save Text"
-      uses: actions/upload-artifact@v2
+    - name: "Archive Built Drafts"
+      uses: actions/upload-artifact@v4
       with:
-        path: "*.txt"
+        path: |
+          draft-*.html
+          draft-*.txt
diff --git a/draft-ietf-mls-architecture.md b/draft-ietf-mls-architecture.md
@@ -1788,7 +1788,7 @@ Similar concerns exist in the peer-to-peer use cases of MLS.
 More generally, using anonymous credentials in an MLS based architecture might
 not be enough to provide strong privacy or anonymity properties.
 
-#### Storage of Metadata and Ecryption at rest on the Servers
+#### Storage of Metadata and Encryption at rest on the Servers
 
 In the case where private data or metadata has to be persisted on the servers
 for functionality (mappings between identities and push tokens, group