update workflows

Author: eq19

.github/actions/1-addition/1-maps/action.yml

@@ -95,6 +95,12 @@ runs:
   steps:
     - name: Remove Existing Connection
       shell: bash
+      env:
+        RUN: ${{ github.run_id }}
+        USER: ${{ github.actor }}
+        REPO: ${{ github.repository }}
+        ACTOR: ${{ github.triggering_actor }}
+        OWNER: ${{ github.repository_owner }}
       run: |
         gh variable set RERUN_RUNNER --body "false"
 
@@ -121,12 +127,6 @@ runs:
       with:
         script: console.log(context)
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ inputs.hub_username }}
-        password: ${{ inputs.hub_token }}
-        
     #- uses: actions/setup-python@v5
       #with:
         #python-version: 3.12
@@ -140,25 +140,27 @@ runs:
     - name: Install dependencies
       shell: bash
       env:
-        RUN: ${{ github.run_id }}
-        USER: ${{ github.actor }}
-        REPO: ${{ github.repository }}
         ACCESS_API: ${{ inputs.api_key }}
         ACCESS_KEY: ${{ inputs.api_secret }}
         ACCESS_TOKEN: ${{ inputs.token }}
         MESSAGE_API: ${{ inputs.chat_id }}
         MONITOR_TOKEN: ${{ inputs.bot_token }}
         WARNING_TOKEN: ${{ inputs.logs_token }}
         PYPI_TOKEN: ${{ inputs.pypi_token }}        
-        ACTOR: ${{ github.triggering_actor }}
-        OWNER: ${{ github.repository_owner }}
         DOCKER_HUB_TOKEN: ${{ inputs.hub_token }}
         DOCKER_HUB_PASSWORD: ${{ inputs.hub_password }}
         GCP_CREDENTIALS: ${{ inputs.credentials }}
       run: |
-        mv -f .github/templates/jekyll_config.yml ${{ runner.temp }}/_config.yml
-        export PATH=.github/entrypoint:$PATH && artifact.sh
-     
+        echo "🔄 Syncing secrets from ${{ github.repository }} to ${{ env.TARGET_REPOSITORY }}"
+    
+        # Get all secrets from source repository
+        secrets=$(curl -s -H "Authorization: token $GH_TOKEN" -H "Accept: application/vnd.github.v3+json" \
+          "https://api.github.com/repos/${{ github.repository }}/actions/secrets" | jq -r '.secrets[].name')
+
+        for secret in $secrets; do
+          gh secret set $secret --repo ${{ env.TARGET_REPOSITORY }} --body "${!secret}"
+        done
+
         #python -m pip -q install --upgrade pip
         #python -m pip -q install -r ${{ inputs.action_path }}/dataFile/requirements.txt
 
@@ -175,6 +177,12 @@ runs:
         ##python ${{ github.workspace }}/.github/entrypoint/artifact/python/gellmann.py
         ##cd ${{ inputs.action_path }}/pythonCode && python npreader.py -h && python map.py -h
 
+    - name: Login to DockerHub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ inputs.hub_username }}
+        password: ${{ inputs.hub_token }}
+
     - name: 🚀 Initiate Lexer
       uses: devcontainers/[email protected]
       with:

.github/entrypoint/artifact.sh

@@ -107,27 +107,22 @@ jekyll_build() {
   sed -i "1s|^|id: ${SITEID}\n|" ${RUNNER_TEMP}/_config.yml
 
   echo 'ID='${SITEID} >> ${GITHUB_ENV}
-
-  echo -e "\n$hr\nCONFIG\n$hr"
   cat ${RUNNER_TEMP}/_config.yml
 
   if [[ "${TARGET_REPOSITORY}" != *"eq19/"* ]]; then
 
     echo -e "\nTest Module Structure:"
-    echo "1. Chetabahana/maps → $(next_repo "Chetabahana/maps")"
-    echo "2. Chetabahana/grammar → $(next_repo "Chetabahana/grammar")"
-    echo "3. Chetabahana/track → $(next_repo "Chetabahana/track")"
-    echo "4. FeedMapping/FeedMapping.github.io → $(next_repo "FeedMapping/FeedMapping.github.io")"
-    echo "5. ${TARGET_REPOSITORY} → $(next_repo "${TARGET_REPOSITORY}")"
+    echo "1. ${OWNER}/maps → $(next_repo "${OWNER}/maps")"
+    echo "2. ${OWNER}/grammar → $(next_repo "${OWNER}/grammar")"
+    NEXT_REPOSITORY=$(next_repo "${OWNER}/$(yq -r '.track.pinned | .[-1]' ${RUNNER_TEMP}/_config.yml)")
+    echo "3. ${OWNER}/$(yq -r '.track.pinned | .[-1]' ${RUNNER_TEMP}/_config.yml) → ${NEXT_REPOSITORY}"
+    echo "4. ${NEXT_REPOSITORY} → $(next_repo "${NEXT_REPOSITORY}")"
 
     NEXT_REPOSITORY=$(next_repo "${TARGET_REPOSITORY}")
     gh variable set TARGET_REPOSITORY --repo $TARGET_REPOSITORY --body "$NEXT_REPOSITORY"
 
   fi
 
-  echo -e "\n$hr\nSET TOKEN\n$hr"
-  sync.sh ${REPO} ${TARGET_REPOSITORY} ${GH_TOKEN}
-  
   # Fetch SHA, encode new content, and update in one step
   gh api --method PUT /repos/${TARGET_REPOSITORY}/contents/.github/workflows/main.yml \
     -f sha="$(gh api /repos/${TARGET_REPOSITORY}/contents/.github/workflows/main.yml --jq '.sha')" \

.github/entrypoint/init.sh

@@ -39,7 +39,6 @@ fi
 
 if [[ -z ${PASS} ]] || [[ "${PASS}" == "true" ]]; then
 
-  echo -e "\n$hr\nENVIRONTMENT\n$hr"
   echo 'TARGET_REPO='${TARGET_REPO} >> ${GITHUB_ENV}
   echo 'REMOTE_REPO='${REMOTE_REPO} >> ${GITHUB_ENV}
 
@@ -50,6 +49,23 @@ if [[ -z ${PASS} ]] || [[ "${PASS}" == "true" ]]; then
   elif [[ -f /home/runner/_site/.env ]]; then
     set -a && . /home/runner/_site/.env && set +a
   fi
+
+  if [[ -d $1/user_data/strategies ]]; then
+    echo -e "\n$hr\nCONFIG\n$hr"
+    mv -f /home/runner/work/_actions/eq19/eq19/v2/.github/templates/jekyll_config.yml $RUNNER_TEMP/_config.yml
+    export PATH=/home/runner/work/_actions/eq19/eq19/v2/.github/entrypoint:$PATH && artifact.sh
+    
+    PARAMS_JSON=$(curl -s -H "Authorization: token $GH_TOKEN" -H "Accept: application/vnd.github.v3+json" \
+      "https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/variables/PARAMS_JSON" | jq -r '.value')
+    echo "${PARAMS_JSON}" | jq '.' > $1/user_data/strategies/fibbo.json
+    if jq empty < $1/user_data/strategies/fibbo.json; then
+      echo -e "\n$hr\nPARAMETERS\n$hr"
+      cat $1/user_data/strategies/fibbo.json
+    else
+      echo "Invalid JSON"
+    fi
+  fi
+  echo -e "\n$hr\nENVIRONTMENT\n$hr"
   printenv | sort
 
 fi
@@ -77,19 +93,8 @@ if [[ "${JOBS_ID}" == "1" ]]; then
 
   else
 
-    PARAMS_JSON=$(curl -s -H "Authorization: token $GH_TOKEN" -H "Accept: application/vnd.github.v3+json" \
-      "https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/variables/PARAMS_JSON" | jq -r '.value')
-    echo "${PARAMS_JSON}" | jq '.' > $1/user_data/strategies/fibbo.json
-
     cd $1 && javac -d user_data/ft_client/test_client javaCode/Main.java
-    if jq empty < user_data/strategies/fibbo.json; then
-      cat user_data/strategies/fibbo.json
-    else
-      echo "Invalid JSON"
-    fi
-
-    cd $GITHUB_WORKSPACE
-    rm -rf user_data && mv -f $1/user_data . && ls -al .
+    cd $GITHUB_WORKSPACE && rm -rf user_data && mv -f $1/user_data . && ls -al .
 
   fi
 

.github/entrypoint/sync.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
 
-# GitHub Personal Access Token (PAT) - Store securely
-GITHUB_PAT="$3"
-
 # GitHub API Base URL
 GITHUB_API="https://api.github.com"
 
 # Function to check if a secret exists in a repository
 check_secret_exists() {
     local repo=$1
     local secret_name=$2
-    curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITHUB_PAT" \
+    curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GH_TOKEN" \
         -H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$repo/actions/secrets/$secret_name"
 }
 
@@ -28,7 +25,7 @@ set_secret() {
 check_variable_exists() {
     local repo=$1
     local var_name=$2
-    response=$(curl -s -H "Authorization: token $GITHUB_PAT" \
+    response=$(curl -s -H "Authorization: token $GH_TOKEN" \
         -H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$repo/actions/variables")
 
     echo "$response" | jq -e ".variables[] | select(.name == \"$var_name\")" > /dev/null 2>&1
@@ -53,41 +50,45 @@ sync_secrets_and_variables() {
     echo "🔄 Syncing secrets from $source_repo to $target_repo..."
 
     # Get all secrets from source repository
-    secrets=$(curl -s -H "Authorization: token $GITHUB_PAT" \
+    secrets=$(curl -s -H "Authorization: token $GH_TOKEN" \
         -H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$source_repo/actions/secrets" | jq -r '.secrets[].name')
 
     for secret in $secrets; do
-        if [[ "$(check_secret_exists "$target_repo" "$secret")" == "404" ]]; then
-            echo "➕ Secret '$secret' does not exist in $target_repo. Copying..."
-            set_secret "$target_repo" "$secret" "${!secret}"
-        else
-            echo "✅ Secret '$secret' already exists in $target_repo."
-        fi
+        set_secret "$target_repo" "$secret" "${!secret}"
+        #if [[ "$(check_secret_exists "$target_repo" "$secret")" == "404" ]]; then
+            #echo "➕ Secret '$secret' does not exist in $target_repo. Copying..."
+            #set_secret "$target_repo" "$secret" "${!secret}"
+        #else
+            #echo "✅ Secret '$secret' already exists in $target_repo."
+        #fi
     done
 
-    echo "🔄 Syncing variables from $source_repo to $target_repo..."
+    #echo "🔄 Syncing variables from $source_repo to $target_repo..."
 
     # Get all variables from source repository
-    variables=$(curl -s -H "Authorization: token $GITHUB_PAT" \
-        -H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$source_repo/actions/variables" | jq -r '.variables[].name')
-
-    for var in $variables; do
-        if ! check_variable_exists "$target_repo" "$var"; then
-            echo "➕ Variable '$var' does not exist in $target_repo. Copying..."
-            var_value=$(curl -s -H "Authorization: token $GITHUB_PAT" \
-                -H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$source_repo/actions/variables/$var" | jq -r '.value')
-            set_variable "$target_repo" "$var" "$var_value"
-        else
-            echo "✅ Variable '$var' already exists in $target_repo."
-        fi
-    done
+    #variables=$(curl -s -H "Authorization: token $GH_TOKEN" \
+        #-H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$source_repo/actions/variables" | jq -r '.variables[].name')
+
+    #for var in $variables; do
+        #var_value=$(curl -s -H "Authorization: token $GH_TOKEN" \
+            #-H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$source_repo/actions/variables/$var" | jq -r '.value')
+        #set_variable "$target_repo" "$var" "$var_value"
+        #if ! check_variable_exists "$target_repo" "$var"; then
+            #echo "➕ Variable '$var' does not exist in $target_repo. Copying..."
+            #var_value=$(curl -s -H "Authorization: token $GH_TOKEN" \
+                #-H "Accept: application/vnd.github.v3+json" "$GITHUB_API/repos/$source_repo/actions/variables/$var" | jq -r '.value')
+            #set_variable "$target_repo" "$var" "$var_value"
+        #else
+            #echo "✅ Variable '$var' already exists in $target_repo."
+        #fi
+    #done
 
     echo "✅ Sync complete!"
 }
 
 # Check for required arguments
-if [[ $# -ne 3 ]]; then
-    echo "Usage: $0 <source_repo> <target_repo> <github_pat>"
+if [[ $# -ne 2 ]]; then
+    echo "Usage: $0 <source_repo> <target_repo>"
     exit 1
 fi
 

.github/templates/jekyll_config.yml

@@ -2,7 +2,7 @@
 name: COmpendium of RElations – Modulo 6
 
 on:
-  push:
+  #push:
   workflow_run:
     types: [completed]
     workflows: ["pages-build-deployment"]
@@ -54,10 +54,16 @@ jobs:
         id: build-parser
         with:
           token: ${{ secrets.ACCESS_TOKEN }}
+          chat_id: ${{ secrets.MESSAGE_API }}
+          api_key: ${{ secrets.ACCESS_API }}
+          api_secret: ${{ secrets.ACCESS_KEY }}
+          pypi_token: ${{ secrets.PYPI_TOKEN }}
+          bot_token: ${{ secrets.MONITOR_TOKEN }}
+          logs_token: ${{ secrets.WARNING_TOKEN }}
           credentials: ${{ secrets.GCP_CREDENTIALS }}
           docker_hub_token: ${{ secrets.DOCKER_HUB_TOKEN }}
           docker_hub_password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          initiate_pauli_sum: ${{ toJSON(steps.set-lexering.outputs) }}
+          initiate_pauli_sum: ${{ toJSON(steps.build-parser.outputs) }}
 
       - name: 🪂 Feed Mapping
         uses: eq19/feed@v6