Skip to content

Commit 5a00c60

Browse files
thomas-fossatithomas-fossati
authored
Merge pull request #60 from ietf-rats-wg/update
Update files
2 parents f75e8f3 + 011bec9 commit 5a00c60

File tree

10 files changed

+158
-172
lines changed

10 files changed

+158
-172
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Automatically generated CODEOWNERS
2+
# Regenerate with `make update-codeowners`
3+
draft-ietf-rats-reference-interaction-models.md henk.birkholz@sit.fraunhofer.de michael.eckel@sit.fraunhofer.de william.panwei@huawei.com evoit@cisco.com

‎.github/workflows/archive.yml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,40 @@ on:
55
- cron: '0 0 * * 0,2,4'
66
repository_dispatch:
77
types: [archive]
8+
workflow_dispatch:
9+
inputs:
10+
archive_full:
11+
description: 'Recreate the archive from scratch'
12+
default: false
13+
type: boolean
814

915
jobs:
1016
build:
1117
name: "Archive Issues and Pull Requests"
1218
runs-on: ubuntu-latest
19+
permissions:
20+
contents: write
1321
steps:
1422
- name: "Checkout"
15-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
24+
25+
# Note: No caching for this build!
1626

1727
- name: "Update Archive"
1828
uses: martinthomson/i-d-template@v1
29+
env:
30+
ARCHIVE_FULL: ${{ inputs.archive_full }}
1931
with:
2032
make: archive
21-
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
token: ${{ github.token }}
2334

2435
- name: "Update GitHub Pages"
2536
uses: martinthomson/i-d-template@v1
2637
with:
2738
make: gh-archive
28-
env:
29-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
token: ${{ github.token }}
3040

3141
- name: "Save Archive"
32-
uses: actions/upload-artifact@v2
42+
uses: actions/upload-artifact@v4
3343
with:
3444
path: archive.json

‎.github/workflows/ghpages.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,43 @@ jobs:
1818
build:
1919
name: "Update Editor's Copy"
2020
runs-on: ubuntu-latest
21+
permissions:
22+
contents: write
2123
steps:
2224
- name: "Checkout"
23-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2426

25-
- name: "Cache Setup"
26-
id: cache-setup
27-
run: |
28-
mkdir -p "$HOME"/.cache/xml2rfc
29-
echo "::set-output name=path::$HOME/.cache/xml2rfc"
30-
date -u "+::set-output name=date::%FT%T"
27+
- name: "Setup"
28+
id: setup
29+
run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"
3130

32-
- name: "Cache References"
33-
uses: actions/cache@v2
31+
- name: "Caching"
32+
uses: actions/cache@v4
3433
with:
35-
path: ${{ steps.cache-setup.outputs.path }}
36-
key: refcache-${{ steps.cache-setup.outputs.date }}
37-
restore-keys: |
38-
refcache-${{ steps.cache-setup.outputs.date }}
39-
refcache-
34+
path: |
35+
.refcache
36+
.venv
37+
.gems
38+
node_modules
39+
.targets.mk
40+
key: i-d-${{ steps.setup.outputs.date }}
41+
restore-keys: i-d-
4042

4143
- name: "Build Drafts"
4244
uses: martinthomson/i-d-template@v1
45+
with:
46+
token: ${{ github.token }}
4347

4448
- name: "Update GitHub Pages"
4549
uses: martinthomson/i-d-template@v1
4650
if: ${{ github.event_name == 'push' }}
4751
with:
4852
make: gh-pages
49-
env:
50-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51-
52-
- name: "Save HTML"
53-
uses: actions/upload-artifact@v2
54-
with:
55-
path: "*.html"
53+
token: ${{ github.token }}
5654

57-
- name: "Save Text"
58-
uses: actions/upload-artifact@v2
55+
- name: "Archive Built Drafts"
56+
uses: actions/upload-artifact@v4
5957
with:
60-
path: "*.txt"
58+
path: |
59+
draft-*.html
60+
draft-*.txt

‎.github/workflows/publish.yml‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,54 @@ on:
44
push:
55
tags:
66
- "draft-*"
7+
workflow_dispatch:
8+
inputs:
9+
email:
10+
description: "Submitter email"
11+
default: ""
12+
type: string
713

814
jobs:
915
build:
1016
name: "Publish New Draft Version"
1117
runs-on: ubuntu-latest
1218
steps:
1319
- name: "Checkout"
14-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
1521

1622
# See https://github.com/actions/checkout/issues/290
1723
- name: "Get Tag Annotations"
1824
run: git fetch -f origin ${{ github.ref }}:${{ github.ref }}
1925

20-
- name: "Cache Setup"
21-
id: cache-setup
22-
run: |
23-
mkdir -p "$HOME"/.cache/xml2rfc
24-
echo "::set-output name=path::$HOME/.cache/xml2rfc"
25-
date -u "+::set-output name=date::%FT%T"
26+
- name: "Setup"
27+
id: setup
28+
run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"
2629

27-
- name: "Cache References"
28-
uses: actions/cache@v2
30+
- name: "Caching"
31+
uses: actions/cache@v4
2932
with:
30-
path: ${{ steps.cache-setup.outputs.path }}
31-
key: refcache-${{ steps.date.outputs.date }}
32-
restore-keys: |
33-
refcache-${{ steps.date.outputs.date }}
34-
refcache-
33+
path: |
34+
.refcache
35+
.venv
36+
.gems
37+
node_modules
38+
.targets.mk
39+
key: i-d-${{ steps.setup.outputs.date }}
40+
restore-keys: i-d-
41+
42+
- name: "Build Drafts"
43+
uses: martinthomson/i-d-template@v1
44+
with:
45+
token: ${{ github.token }}
3546

3647
- name: "Upload to Datatracker"
3748
uses: martinthomson/i-d-template@v1
3849
with:
3950
make: upload
51+
env:
52+
UPLOAD_EMAIL: ${{ inputs.email }}
53+
54+
- name: "Archive Submitted Drafts"
55+
uses: actions/upload-artifact@v4
56+
with:
57+
path: "versioned/draft-*-[0-9][0-9].*"

‎.github/workflows/update.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: "Update Generated Files"
2+
# This rule is not run automatically.
3+
# It can be run manually to update all of the files that are part
4+
# of the template, specifically:
5+
# - README.md
6+
# - CONTRIBUTING.md
7+
# - .note.xml
8+
# - .github/CODEOWNERS
9+
# - Makefile
10+
#
11+
#
12+
# This might be useful if you have:
13+
# - added, removed, or renamed drafts (including after adoption)
14+
# - added, removed, or changed draft editors
15+
# - changed the title of drafts
16+
#
17+
# Note that this removes any customizations you have made to
18+
# the affected files.
19+
on: workflow_dispatch
20+
21+
jobs:
22+
build:
23+
name: "Update Files"
24+
runs-on: ubuntu-latest
25+
steps:
26+
- name: "Checkout"
27+
uses: actions/checkout@v4
28+
29+
- name: "Update Generated Files"
30+
uses: martinthomson/i-d-template@v1
31+
with:
32+
make: update-files
33+
token: ${{ github.token }}
34+
35+
- name: "Push Update"
36+
run: git push

‎.gitignore‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1-
*~
2-
/*-[0-9][0-9].xml
3-
archive.json
41
*.html
52
*.pdf
63
*.redxml
7-
.refcache
8-
report.xml
94
*.swp
10-
.tags
11-
.targets.mk
125
*.txt
136
*.upload
14-
venv/
15-
lib
7+
*~
8+
.tags
9+
/*-[0-9][0-9].xml
10+
/.*.mk
11+
/.gems/
12+
/.refcache
13+
/.venv/
14+
/.vscode/
15+
/lib
16+
/node_modules/
17+
/versioned/
18+
Gemfile.lock
19+
archive.json
1620
draft-ietf-rats-reference-interaction-models.xml
21+
package-lock.json
22+
report.xml
23+
!requirements.txt

‎CONTRIBUTING.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ BCP 78, 79, the TLP, and the TLP rules regarding code components (e.g. being
1717
subject to a Simplified BSD License) in Contributions.
1818

1919

20-
## Other Resources
20+
## Working Group Information
2121

22-
Discussion of this work occurs on the
23-
[rats working group mailing list](https://mailarchive.ietf.org/arch/browse/rats/)
24-
([subscribe](https://www.ietf.org/mailman/listinfo/rats)). In addition to
25-
contributions in GitHub, you are encouraged to participate in discussions there.
22+
Discussion of this work occurs on the [Remote ATtestation ProcedureS
23+
Working Group mailing list](mailto:rats@ietf.org)
24+
([archive](https://mailarchive.ietf.org/arch/browse/rats/),
25+
[subscribe](https://www.ietf.org/mailman/listinfo/rats)).
26+
In addition to contributions in GitHub, you are encouraged to participate in
27+
discussions there.
2628

2729
**Note**: Some working groups adopt a policy whereby substantive discussion of
2830
technical issues needs to occur on the mailing list.
2931

3032
You might also like to familiarize yourself with other
31-
[working group documents](https://datatracker.ietf.org/wg/rats/documents/).
33+
[Working Group documents](https://datatracker.ietf.org/wg/rats/documents/).

‎Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ include $(LIBDIR)/main.mk
44
$(LIBDIR)/main.mk:
55
ifneq (,$(shell grep "path *= *$(LIBDIR)" .gitmodules 2>/dev/null))
66
git submodule sync
7-
git submodule update $(CLONE_ARGS) --init
7+
git submodule update --init
88
else
9-
git clone -q --depth 10 $(CLONE_ARGS) \
10-
-b main https://github.com/martinthomson/i-d-template $(LIBDIR)
9+
ifneq (,$(wildcard $(ID_TEMPLATE_HOME)))
10+
ln -s "$(ID_TEMPLATE_HOME)" $(LIBDIR)
11+
else
12+
git clone -q --depth 10 -b main \
13+
https://github.com/martinthomson/i-d-template $(LIBDIR)
14+
endif
1115
endif

0 commit comments

Comments
 (0)