From 261f1f492cbbbe202e438922772e5aa4566f4333 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Oct 2025 15:57:16 -0400 Subject: [PATCH] Updating workflows. --- .gitea/workflows/hugo-content-deployment.yml | 129 +++++++++--------- .../workflows/hugo-translation-deployment.yml | 102 ++++++++------ 2 files changed, 131 insertions(+), 100 deletions(-) diff --git a/.gitea/workflows/hugo-content-deployment.yml b/.gitea/workflows/hugo-content-deployment.yml index 9bd5995..6a138fe 100644 --- a/.gitea/workflows/hugo-content-deployment.yml +++ b/.gitea/workflows/hugo-content-deployment.yml @@ -1,16 +1,19 @@ name: Deploy Hugo Site + env: - TEA_VERSION: '0.10.1' + TEA_VERSION: "0.10.1" + on: workflow_dispatch: push: branches-ignore: - - 'main' + - "main" paths: - - '**.md' - - '**.toml' - - '!config/_default/menus*.toml' - - 'assets/**' + - "**.md" + - "**.toml" + - "!config/_default/menus*.toml" + - "assets/**" + jobs: check-and-create-pr: if: github.ref != 'refs/heads/main' @@ -21,46 +24,31 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 1 - - name: Cache tea CLI - id: cache-tea - uses: actions/cache@v4 - with: - path: /opt/hostedtoolcache/tea/${{ env.TEA_VERSION }}/x64 - key: tea-${{ runner.os }}-${{ env.TEA_VERSION }} - - name: Install tea - uses: supplypike/setup-bin@v4 - with: - uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 - name: tea - version: ${{ env.TEA_VERSION }} + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: PR Check' - notification_message: 'Checking for existing PR... 🔍' - - name: Check if open PR exists - id: check-opened-pr-step - continue-on-error: true - run: | - tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - pr_exists=$(tea pr list --repo ${{ github.repository }} --state open fields-- index,title,head | egrep '\[HUGO\].*${{ github.ref_name }}' | tail -1 | wc -l) - echo "exists=$pr_exists" >> $GITHUB_OUTPUT - - name: Create PR - if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }} - run: | - tea login default gitea-rinoa - pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]' | head -1 | awk -F"," '{print $1}') - pr_index_new=$(expr ${pr_index_old} + 1) - tea pr c -r ${{ github.repository }} -t "[HUGO] Automated PR for ${{ github.ref_name }} - #${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} -L "Docker Compose" + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: PR Check" + notification_message: "Checking for existing PR... 🔍" + + - name: PR Check/Creation + uses: https://git.trez.wtf/Trez/gitea-auto-pr@main + with: + url: ${{ secrets.TREZ_GITEA_URL }} + token: ${{ secrets.BOT_GITEA_TOKEN }} + pr-label: hugo,manual + assignee: ${{ github.actor }} + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: PR Check' - notification_message: 'PR Created 🎟️' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: PR Check" + notification_message: "PR Check done 🎟️" + hugo-sanity-check: name: Hugo Sanity Check needs: [check-and-create-pr] @@ -70,22 +58,26 @@ jobs: uses: actions/checkout@v4 with: submodules: true + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Starting link inspectionn... 🔍' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Starting link inspectionn... 🔍" + - name: Install Hugo uses: peaceiris/actions-hugo@v3.0.0 with: - hugo-version: 'latest' + hugo-version: "latest" # extended: true + - name: Verify Hugo install run: | hugo env hugo version + - name: Linkinator uses: JustinBeckwith/linkinator-action@v1.11.0 with: @@ -95,13 +87,15 @@ jobs: recurse: true markdown: true verbosity: error + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Broken link inspection done... 🔍' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Broken link inspection done... 🔍" + pr-merge: name: PR Merge needs: [hugo-sanity-check] @@ -109,34 +103,39 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Cache tea CLI id: cache-tea uses: actions/cache@v4 with: path: /opt/hostedtoolcache/tea/${{ env.TEA_VERSION }}/x64 key: tea-${{ runner.os }}-${{ env.TEA_VERSION }} + - name: Install tea uses: supplypike/setup-bin@v4 with: uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 name: tea version: ${{ env.TEA_VERSION }} + - name: PR Merge id: pr_merge run: | - tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} + tea login add --name gitea-rinoa --url ${{ secrets.GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login default gitea-rinoa echo "Merging PR..." pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g') tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR ${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" ${pr_index} echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: PR Merge Successful' - notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: PR Merge Successful" + notification_message: "PR #${{ steps.pr_merge.outputs.pr_index }} merged." + deploy-hugo-site: name: Build and Deploy to Server needs: [hugo-sanity-check, pr-merge] @@ -146,23 +145,27 @@ jobs: uses: actions/checkout@v4 with: submodules: true + - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: hugo-version: "latest" extended: true + - name: Setup rsync id: setup_rsync uses: GuillaumeFalourd/setup-rsync@v1.2 with: ssh_key: ${{ secrets.VPS_DEPLOY_KEY }} + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Starting Hugo deployment... 🤞🏽' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Starting Hugo deployment... 🤞🏽" + - name: Generate Hugo Site & Deploy for Docker env: VPS_DEPLOY_USER: ${{ secrets.HUGO_DEPLOY_USERNAME }} @@ -172,6 +175,7 @@ jobs: run: | hugo --minify --source . rsync -e "ssh -i ${VPS_DEPLOY_KEY} -o StrictHostKeyChecking=no" -avz --progress ./public ${VPS_DEPLOY_USER}@192.168.1.254:${VPS_DEPLOY_DEST} + - name: Restart Hugo Container uses: appleboy/ssh-action@v1.2.2 with: @@ -181,10 +185,11 @@ jobs: key_path: ${{ steps.setup_rsync.outputs.ssh_key_path }} script: | docker container restart hugo + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Hugo deployment successful!' \ No newline at end of file + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Hugo deployment successful!" diff --git a/.gitea/workflows/hugo-translation-deployment.yml b/.gitea/workflows/hugo-translation-deployment.yml index f2d526a..6f979e6 100644 --- a/.gitea/workflows/hugo-translation-deployment.yml +++ b/.gitea/workflows/hugo-translation-deployment.yml @@ -1,14 +1,17 @@ name: Deploy Hugo Site + env: - TEA_VERSION: '0.10.1' + TEA_VERSION: "0.10.1" + on: workflow_dispatch: push: branches-ignore: - - 'main' + - "main" paths: - - 'content/en/*.md' - - 'config/_default/menus*.toml' + - "content/en/*.md" + - "config/_default/menus*.toml" + jobs: hugo-translation-pr: name: Hugo Translations & PR Creation @@ -16,40 +19,46 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v4 + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo @ Rinoa' - notification_message: 'Starting translations...' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo @ Rinoa" + notification_message: "Starting translations..." + - name: Get file listing of English content id: list_files run: | echo "files=$(find content/en -type f -name "*.md" | tr '\n' ' ')" >> $GITHUB_OUTPUT + - name: GPT Translations (es,ko,zh-Hans) - uses: 3ru/gpt-translate@v1.2.2 + uses: 3ru/gpt-translate@v1.2.2 # PR creation happens here with: token: ${{ secrets.BOT_GITEA_TOKEN }} - provider: 'openai' + provider: "openai" apikey: ${{ secrets.OPENAI_API_KEY }} - model: 'gpt-4o' + model: "gpt-4o" inputFiles: ${{ steps.list_files.outputs.files }} - outputFiles: 'content/es/*.md content/ko/*.md content/zh-Hans/*.md' + outputFiles: "content/es/*.md content/ko/*.md content/zh-Hans/*.md" languages: Spanish Korean Chinese + - name: Add/Commit Translations id: commit-translations uses: EndBug/add-and-commit@v9 with: message: "Adding translated content..." - add: './content/*' + add: "./content/*" + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo @ Rinoa' - notification_message: 'Translations completed! Continuing to Hugo sanity check...' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo @ Rinoa" + notification_message: "Translations completed! Continuing to Hugo sanity check..." + hugo-sanity-check: name: Hugo Sanity Check needs: [check-and-create-pr] @@ -57,22 +66,26 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v4 + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Starting link inspectionn... 🔍' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Starting link inspectionn... 🔍" + - name: Install Hugo uses: peaceiris/actions-hugo@v3.0.0 with: - hugo-version: 'latest' + hugo-version: "latest" extended: true + - name: Verify Hugo install run: | hugo env hugo version + - name: Linkinator uses: JustinBeckwith/linkinator-action@v1.11.0 with: @@ -82,13 +95,15 @@ jobs: recurse: true markdown: true verbosity: error + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Broken link inspection done... 🔍' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Broken link inspection done... 🔍" + pr-merge: name: PR Merge needs: [hugo-sanity-check] @@ -96,18 +111,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Cache tea CLI id: cache-tea uses: actions/cache@v4 with: path: /opt/hostedtoolcache/tea/${{ env.TEA_VERSION }}/x64 key: tea-${{ runner.os }}-${{ env.TEA_VERSION }} + - name: Install tea uses: supplypike/setup-bin@v4 with: uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 name: tea version: ${{ env.TEA_VERSION }} + - name: PR Merge id: pr_merge run: | @@ -117,13 +135,15 @@ jobs: pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g') tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR ${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" ${pr_index} echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: PR Merge Successful' - notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: PR Merge Successful" + notification_message: "PR #${{ steps.pr_merge.outputs.pr_index }} merged." + deploy-hugo-site: name: Build and Deploy to Server needs: [hugo-sanity-check, pr-merge] @@ -133,23 +153,27 @@ jobs: uses: actions/checkout@v4 with: submodules: true + - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: hugo-version: "latest" extended: true + - name: Setup rsync id: setup_rsync uses: GuillaumeFalourd/setup-rsync@v1.2 with: ssh_key: ${{ secrets.VPS_DEPLOY_KEY }} + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Starting Hugo deployment... 🤞🏽' + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Starting Hugo deployment... 🤞🏽" + - name: Generate Hugo Site & Deploy for Docker env: VPS_DEPLOY_USER: ${{ secrets.HUGO_DEPLOY_USERNAME }} @@ -161,6 +185,7 @@ jobs: hugo version hugo --minify --source . rsync -e "ssh -i ${VPS_DEPLOY_KEY} -o StrictHostKeyChecking=no" -avz --progress ./public ${VPS_DEPLOY_USER}@192.168.1.254:${VPS_DEPLOY_DEST} + - name: Restart Hugo Container uses: appleboy/ssh-action@v1.2.2 with: @@ -170,10 +195,11 @@ jobs: key_path: ${{ steps.setup_rsync.outputs.ssh_key_path }} script: | docker container restart hugo + - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' - notification_title: 'GITEA: Hugo' - notification_message: 'Hugo deployment successful!' \ No newline at end of file + gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" + gotify_app_token: "${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}" + notification_title: "GITEA: Hugo" + notification_message: "Hugo deployment successful!"