Merge pull request #1796 from cncf/main

Update dev-pt with the main branch

Author: seokho-son

.devcontainer.json

@@ -0,0 +1,9 @@
+{
+    "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node",
+    "features": {
+        "ghcr.io/devcontainers/features/hugo:1": {
+            "extended": true
+        }
+    },
+    "postCreateCommand": "git submodule update --init --recursive && npm install"
+}

.github/settings.yml

@@ -36,6 +36,9 @@ collaborators:
   - username: iamNoah1
     permission: maintain  
 
+  - username: thetwopct
+    permission: push
+
   # English approvers (approver for all files in repository)
 
 
@@ -127,6 +130,9 @@ collaborators:
   # l10n es approvers
   - username: raelga
     permission: push
+
+  - username: ramrodo
+    permission: push
 
   - username: electrocucaracha
     permission: push
@@ -335,6 +341,7 @@ branches:
         # es approvers
         users:
          - raelga
+         - ramrodo
          - electrocucaracha
          - krol3
          - 92nqb

.github/workflows/check-outdated-terms.yaml

@@ -3,14 +3,19 @@
 name: Check outdated terms
 on: 
   pull_request:
-    paths:
-      - 'content/en/**.md'
     branches:
       - 'dev-ko' # add other branches or use wildcard 'dev-**'
+    paths:
+      - 'content/en/**.md'
 
 jobs:
   check-outdated-terms:
     name: Check outdated terms
+
+    # if: contains(fromJSON('["dev-ko", "dev-xx"]'), github.base_ref) 
+    # Ref: https://docs.github.com/en/actions/learn-github-actions/expressions
+
+    if: github.base_ref == 'dev-ko'
 
     # Condition to run this workflow on the upstream repository
     #if: github.repository == 'cncf/glossary'
@@ -30,6 +35,9 @@ jobs:
         L10N_BRANCH="${{github.base_ref}}"
         echo "(DEBUG) L10N Branch: ${L10N_BRANCH}"
         
+        # Set output direcory
+        OUTPUT_DIR="./outdated"
+        
         # Set L10n directory and code
         case "${L10N_BRANCH}" in
           dev-ko)          
@@ -46,10 +54,11 @@ jobs:
         echo "(DEBUG) L10N Directory: ${L10N_DIR}"
         echo "(DEBUG) L10N Code: ${L10N_CODE}"
         
-        # Set L10N_DIR and L10N_CODE as environment variables
+        # Set L10N_DIR, L10N_CODE, and OUTPUT_DIR as environment variables
         # Ref: https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable
         echo "L10N_DIR=${L10N_DIR}" >> $GITHUB_ENV
-        echo "L10N_CODE=${L10N_CODE}" >> $GITHUB_ENV        
+        echo "L10N_CODE=${L10N_CODE}" >> $GITHUB_ENV
+        echo "OUTPUT_DIR=${OUTPUT_DIR}" >> $GITHUB_ENV
     
     - name: Checkout 
       uses: actions/checkout@v3
@@ -88,38 +97,59 @@ jobs:
         echo "(DUBUG) OLD_BRANCH: ${OLD_BRANCH}"
         
         # Make an output directory
-        mkdir outdated
+        if [[ ! -e $OUTPUT_DIR ]]; then
+            mkdir $OUTPUT_DIR
+        elif [[ ! -d $OUTPUT_DIR ]]; then
+            echo "$OUTPUT_DIR already exists but is not a directory" 1>&2
+        fi
         
         # Check outdated only if there is a localized term
         # Loop files in a localization directory, which is ${L10N_DIR} (e.g., ./content/ko/)
         echo "(DEBUG) Check outdated"
-        for FILE_PATH in $(find ${L10N_DIR} -name '*.md'); do
-            # ${MYVAR#pattern}: delete shortest match of pattern from the beginning
-            FILE_NAME="${FILE_PATH#${L10N_DIR}}" 
+        for L10N_FILE_PATH in $(find ${L10N_DIR} -name '*.md'); do
+            echo "(DEBUG) L10N_FILE_PATH: ${L10N_FILE_PATH}"      
+
+            # Note - extracting a pattern-based substring (https://stackoverflow.com/a/19482947)      
+            FILE_PATH="${L10N_FILE_PATH#${L10N_DIR}}"
+            FILE_DIR=$(dirname ${FILE_PATH})
+            FILE_NAME=$(basename ${FILE_PATH})
+            
+            echo "(DEBUG) FILE_PATH: ${FILE_PATH}"
+            echo "(DEBUG) FILE_DIR: ${FILE_DIR}"
             echo "(DEBUG) FILE_NAME: ${FILE_NAME}"
-            echo "(DEBUG) Localized file path: $FILE_PATH"
-            echo "(DEBUG) Original file path: ./content/en/${FILE_NAME}"
+            echo "(DEBUG) Localized file path: $L10N_FILE_PATH"
+            echo "(DEBUG) Original file path: ./content/en/${FILE_PATH}"
+
+            # Create subdirectories
+            mkdir -p ${OUTPUT_DIR}/${FILE_DIR}
             
             # Actually compare between the old and lastest English terms and log diff in the file
-            if [[ -f "./content/en/${FILE_NAME}" ]]; then
+            if [[ -f "./content/en/${FILE_PATH}" ]]; then
               # File exists
-              git diff ${OLD_BRANCH}..${LATEST_BRANCH} -- ./content/en/${FILE_NAME} > ./outdated/${FILE_NAME}
+              # Check changes
+              git diff ${OLD_BRANCH}..${LATEST_BRANCH} -- ./content/en/${FILE_PATH} > temp.diff
+
+              if [[ -s "temp.diff" ]]; then
+                echo "(DEBUG) ${FILE_PATH} is outdated."
+                mv temp.diff ${OUTPUT_DIR}/${FILE_PATH}
+              fi
+
             else
+              echo "(DEBUG) ${FILE_PATH} dose not exist."
               # File dose not exist (e.g, changed, renamed or removed)
-              echo "Could not find ${FILE_NAME} in content/en/" > ./outdated/${FILE_NAME}
-              echo "Need to check if it has been changed, renamed or removed" >> ./outdated/${FILE_NAME}
+              echo "Could not find ${FILE_PATH} in content/en/" > ${OUTPUT_DIR}/${FILE_PATH}
+              echo "Need to check if it has been changed, renamed or removed" >> ${OUTPUT_DIR}/${FILE_PATH}
             fi
-
         done 
         
         echo "(DEBUG) The outdated files"
-        ls -al ./outdated
+        ls -al ${OUTPUT_DIR}
         
     - name: Upload output
       uses: actions/upload-artifact@v3
       with:
         name: ${{ env.L10N_CODE }}-outdated-checking-result
-        path: ./outdated/
+        path: ${{ env.OUTPUT_DIR }}/
 
 #     - name: Create an issue from file    
 #       uses: peter-evans/create-issue-from-file@v4
@@ -128,4 +158,4 @@ jobs:
 #         content-filepath:  ${{ steps.checker.outputs.output_path }}
 #         labels: |
 #           outdated
-#           lang/ko
+#           lang/ko

.github/workflows/es-spellcheck.yml

@@ -24,7 +24,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Check word list sort
+        run: |
+          set -o errexit
+          diff content/es/.wordlist.txt <(LC_ALL= sort -f content/es/.wordlist.txt)
       - name: GitHub Spellcheck Action
-        uses: rojopolis/spellcheck-github-actions@0.28.0
+        uses: rojopolis/spellcheck-github-actions@0.29.0
         with:
           config_path: content/es/.spellcheck.yml

.github/workflows/spellcheck.yml

@@ -25,4 +25,4 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: GitHub Spellcheck Action
-        uses: rojopolis/spellcheck-github-actions@0.28.0
+        uses: rojopolis/spellcheck-github-actions@0.29.0

CODEOWNERS

@@ -34,7 +34,7 @@
 /content/bn/ @mitul3737 @Mouly22 @ikramulkayes @Imtiaz1234
 
 # Approvers for Spanish contents
-/content/es/ @raelga @electrocucaracha @krol3 @92nqb
+/content/es/ @raelga @ramrodo @electrocucaracha @krol3 @92nqb
 
 # Approvers for Chinese contents
 /content/zh-cn/ @hanyuancheung @Jacob953 @Rocksnake @Submarinee

README.md

@@ -33,3 +33,5 @@ npm install
 ```
 
 You can then run the site using `hugo server`.
+
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?repo=cncf/glossary)