diff --git a/.github/workflows/gen_author_list.sh b/.github/workflows/gen_author_list.sh index 8aad0f2..5cb29a4 100755 --- a/.github/workflows/gen_author_list.sh +++ b/.github/workflows/gen_author_list.sh @@ -45,7 +45,6 @@ sorted_xml_authors() { # output authors as an XML element for a in $AUTHORS; do - FULL_NAME=`grep $a $0 | awk -F'"' '{print $2}'` ORGANIZATION=`grep $a $0 | awk -F'"' '{print $4}'` FIRST_NAME=`echo $FULL_NAME | awk '{print $1}'` @@ -74,7 +73,3 @@ main() { main "$@" - - -#### AUTHOR INFO #### -#kwatsen: "Kent Watsen" "Watsen Networks" "kent+ietf@watsen.net" diff --git a/.github/workflows/gen_index_html.sh b/.github/workflows/gen_index_html.sh index bda257a..0ee0a8c 100644 --- a/.github/workflows/gen_index_html.sh +++ b/.github/workflows/gen_index_html.sh @@ -32,7 +32,6 @@ echo "" >> index.html echo " " >> index.html echo " " >> index.html echo " " >> index.html -echo " " >> index.html echo " " >> index.html echo " " >> index.html echo " " >> index.html @@ -41,28 +40,31 @@ for branch in $SORTED; do NUMBER=`grep NUMBER $branch/metadata.txt | awk '{print $2}'` TITLE=`grep TITLE $branch/metadata.txt | awk '{for (i=2; i$DATE" >> index.html + # the "Pull Request" column if [ $branch = "main" ]; then echo " " >> index.html else echo " " >> index.html fi - if [ $branch = "main" ]; then - echo " " >> index.html - else - echo " " >> index.html - fi + # get main's draft version number (delete the trailing '|| echo "00"' once merged into main) + MVER=`ls -1 main/draft-yn-netmod-yang-xml-[0-9][0-9].xml | sed -e 's/.*-//' -e 's/\.xml$//' || echo "00"` + + # get branch's draft version number (yes, branch may be "main" too) + BVER=`ls -1 $branch/draft-yn-netmod-yang-xml-[0-9][0-9].xml | sed -e 's/.*-//' -e 's/\.xml$//'` - echo " " >> index.html + # the "Formats" column + echo " " >> index.html + # the "Actions" column if [ $branch = "main" ]; then - echo " " >> index.html + echo " " >> index.html else - echo " " >> index.html + echo " " >> index.html fi echo " " >> index.html done diff --git a/.github/workflows/pull_request_closed.yml b/.github/workflows/pull_request_closed.yml index 499136d..04a6515 100644 --- a/.github/workflows/pull_request_closed.yml +++ b/.github/workflows/pull_request_closed.yml @@ -33,14 +33,14 @@ jobs: tar -xzvf drafts.tgz rm drafts.tgz - # if merged... + # if merged... (i.e., PR succeeded) - name: If merged, move compiled artifacts to 'main' if: github.event.pull_request.merged == true run: | rm -rf mysite/main mv mysite/${{github.head_ref}} mysite/main - # if not merged... + # if not merged... (i.e., PR failed) - name: If not merged, just delete the branch dir if: github.event.pull_request.merged == false run: | @@ -50,7 +50,7 @@ jobs: - name: Create mysite/index.html run: | chmod +x .github/workflows/gen_index_html.sh - .github/workflows/gen_index_html.sh "${{github.event.pull_request.number}}" "${{github.event.pull_request.title}}" "${{github.event.pull_request.head.ref}}" + .github/workflows/gen_index_html.sh # recreate the drafts.tgz - name: Recreate drafts.tgz diff --git a/.github/workflows/pull_request_updated.yml b/.github/workflows/pull_request_updated.yml index 85a06ac..feeb5b3 100644 --- a/.github/workflows/pull_request_updated.yml +++ b/.github/workflows/pull_request_updated.yml @@ -28,6 +28,8 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.ref }} + fetch-depth: 0 + fetch-tags: true - name: generate authors.txt run: | chmod +x .github/workflows/gen_author_list.sh @@ -38,7 +40,8 @@ jobs: wget https://raw.githubusercontent.com/ietf-tools/rfcfold/master/rfcfold chmod +x rfcfold - name: Run "make" - run: make + run: | + make - name: Upload Artifacts uses: actions/upload-artifact@v4 with: @@ -174,9 +177,11 @@ jobs: } rm drafts.tgz - # create the "mysite//" directory, in case it's not there already + # create the "mysite//" directory (delete old if present) - name: Create the mysite// directory - run: mkdir -p mysite/${{github.head_ref}} + run: | + rm -rf mysite/${{github.head_ref}} + mkdir mysite/${{github.head_ref}} # download the just-built artifacts - name: Download built artifacts @@ -190,9 +195,8 @@ jobs: mv draft-yn-netmod-*-[0-9][0-9].* mysite/${{github.head_ref}}/ # stash some metadata - - name: Stash some metadata + - name: Stash some metadata (for gen_index_html.sh) run: | - echo "${{github.event.pull_request}}" echo "NUMBER: ${{github.event.pull_request.number}}" > mysite/${{github.head_ref}}/metadata.txt echo "TITLE: ${{github.event.pull_request.title}}" >> mysite/${{github.head_ref}}/metadata.txt echo "DATE: $(date +%Y-%m-%dT%H:%M:%SZ)" >> mysite/${{github.head_ref}}/metadata.txt @@ -207,7 +211,7 @@ jobs: - name: Create mysite/index.html run: | chmod +x .github/workflows/gen_index_html.sh - .github/workflows/gen_index_html.sh "${{github.event.pull_request.number}}" "${{github.event.pull_request.title}}" "${{github.event.pull_request.head.ref}}" + .github/workflows/gen_index_html.sh # recreate the drafts.tgz - name: Recreate drafts.tgz diff --git a/.github/workflows/update_page.py b/.github/workflows/update_page.py deleted file mode 100644 index 407c3c4..0000000 --- a/.github/workflows/update_page.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def main(): - print ("Inside Python script...") - sys.exit(0) - -if __name__ == '__main__': - main() diff --git a/draft-yn-netmod-yang-xml.xml b/draft-yn-netmod-yang-xml.xml index b61d0f8..e4d88fb 100644 --- a/draft-yn-netmod-yang-xml.xml +++ b/draft-yn-netmod-yang-xml.xml @@ -44,6 +44,8 @@ This document is developed on GitHub at ). If you wish to contribute, please consider opening a pull request (PR). See the README file for details. + See for a dashboard of the document's + status. @@ -913,9 +915,11 @@ leaf-list foo {
+ FIXME
+ FIXME
UpdatedPull RequestMerge OperationFormatsActions
N/A, since this is the \"main\" branch (last updated by #$NUMBER: $TITLE).#$NUMBER: $TITLEN/A, since this is the \"main\" branch.Branch \"$branch\" merges into branch \"$BASE\".
html / text / xml
html / text / xml
Diff with Datatracker Diff with Datatracker Diff with Main Diff with Main