From 9a6fb3a34ee4173836e6a09b5af602c19a004c8d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:10:42 -0400 Subject: [PATCH 1/8] Tweaking Vault unseal action #3. --- .gitea/workflows/vault-auto-unseal-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/vault-auto-unseal-flow.yml b/.gitea/workflows/vault-auto-unseal-flow.yml index 7478d42e..30b5cdd3 100644 --- a/.gitea/workflows/vault-auto-unseal-flow.yml +++ b/.gitea/workflows/vault-auto-unseal-flow.yml @@ -28,7 +28,7 @@ jobs: uses: cpanato/vault-installer@main - name: Unseal Vault run: | - cat ${VAULT_SHARDS} + echo ${VAULT_SHARDS} for vault_shard in $(cat ${VAULT_SHARDS}); do vault operator unseal -address=${VAULT_ADDR} -non-interactive "${vault_shard}" done \ No newline at end of file From fe67a6fa735ac51fb758e788707c9c6128056b71 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:24:05 -0400 Subject: [PATCH 2/8] Adding pipeline exclusively for Ansible. --- .../pr-ansible-config-deployment.yaml | 192 ++++++++++++++++++ 1 file changed, 192 insertions(+) create mode 100644 .gitea/workflows/pr-ansible-config-deployment.yaml diff --git a/.gitea/workflows/pr-ansible-config-deployment.yaml b/.gitea/workflows/pr-ansible-config-deployment.yaml new file mode 100644 index 00000000..8ba7f305 --- /dev/null +++ b/.gitea/workflows/pr-ansible-config-deployment.yaml @@ -0,0 +1,192 @@ +name: Gitea Branch PR, Cloudflare DNS, README generation, & Ansible/Docker Deployment +on: + push: + branches-ignore: + - 'main' + paths: + - '**.j2' + - 'ansible/**.yml' +jobs: + check-and-create-pr: + if: github.ref != 'refs/heads/main' + name: Check and Create PR + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + fetch-depth: 1 + - name: Cache tea CLI + id: cache-tea + uses: actions/cache@v4 + with: + path: /opt/hostedtoolcache/tea/0.9.2/x64 + key: tea-${{ runner.os }}-0.9.2 + - name: Install tea + uses: supplypike/setup-bin@v4 + with: + uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64' + name: 'tea' + version: '0.9.2' + - 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 ${{ 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 "Automated PR for ${{ github.ref_name }} - #${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} -L "Docker Compose, Ansible Configs.j2" + - 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 🎟️' + ansible-linting: + name: Docker Compose & Ansible Lints + needs: [check-and-create-pr] + runs-on: ubuntu-latest + env: + VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} + VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} + VAULT_NAMESPACE: "" + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Fetch base branch + run: | + git fetch origin ${{ github.event.pull_request.base.ref }} + - name: Cache Ansible Galaxy Collections + uses: actions/cache@v3 + with: + path: ansible/collections + key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }} + restore-keys: | + ${{ runner.os }}-ansible- + - name: Install Ansible + uses: alex-oleshkevich/setup-ansible@v1.0.1 + with: + version: "11.0.0" + - name: Install Vault + uses: cpanato/vault-installer@main + - name: Install hvac + run: pip install hvac + - 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: Ansible Config Dry Run @ Rinoa' + notification_message: 'Starting Ansible dry run...' + - name: Ansible Playbook Dry Run + uses: arillso/action.playbook@0.1.0 + with: + check: true + galaxy_collections_path: ansible/collections + galaxy_requirements_file: ansible/collections/requirements.yml + inventory: ansible/inventory/hosts.yml + playbook: ansible/docker_config_deploy.yml + private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }} + vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }} + verbose: 0 + - 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: Docker Compose Dry Run @ Rinoa' + notification_message: 'Docker Compose dry run completed successfully.' + pr-merge: + name: PR Merge + needs: [regenerate-readme-modified-services] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Install tea + uses: supplypike/setup-bin@v4 + with: + uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64' + name: 'tea' + version: '0.9.2' + - 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 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.' + ansible-config-docker-compose-deploy: + name: Ansible Configs & Docker Compose Deployment + runs-on: ubuntu-latest + needs: [pr-merge] + env: + VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} + VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} + DOCKER_HOST: tcp://dockerproxy:2375 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: main + - name: Cache Vault install + id: cache-vault + uses: actions/cache@v4 + with: + path: /opt/hostedtoolcache/vault/1.18.0/x64 + key: vault-${{ runner.os }}-1.18.0 + - name: Install Ansible + uses: alex-oleshkevich/setup-ansible@v1.0.1 + with: + version: "11.0.0" + - name: Install Vault + uses: cpanato/vault-installer@main + - name: Install hvac + run: pip install hvac + - 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: Ansible Config Deployment @ Rinoa' + notification_message: 'Starting config deployment with Ansible...' + - name: Ansible Playbook Dry Run + uses: arillso/action.playbook@0.1.0 + with: + check: false + galaxy_collections_path: ansible/collections + galaxy_requirements_file: ansible/collections/requirements.yml + inventory: ansible/inventory/hosts.yml + playbook: ansible/docker_config_deploy.yml + private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }} + vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }} + - 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: Ansible Config Deployment @ Rinoa' + notification_message: 'Deployment completed successfully.' \ No newline at end of file From 087c5ed5e09b4c7913c6e3a26dcbbe5d3241b02b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:24:06 -0400 Subject: [PATCH 3/8] Removing Ansible steps from pipeline. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 46695e01..10130e81 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -4,7 +4,7 @@ on: branches-ignore: - 'main' paths: - - '**.yml' + - '**/docker-compose.yml' - '!ansible/**.yml' jobs: check-and-create-pr: @@ -258,20 +258,6 @@ jobs: uses: actions/checkout@v4 - name: Install yq uses: dcarbone/install-yq-action@v1 - # - name: Fetch main branch for comparison - # run: | - # git fetch origin main:main - # - name: Compare services using yq - # continue-on-error: true - # id: compare-services - # run: | - # current_services=$(yq '.services | to_entries' docker-compose.yml) - # git show main:docker-compose.yml > main_compose.yml - # main_services=$(yq '.services | to_entries' main_compose.yml) - # modified_services_file=$(comm -13 <(echo "$main_services") <(echo "$current_services") > changes_compose.yml) - # modified_services=${egrep '^ [a-z]' changes.yml | sed -e 's|^ ||g' -e 's|:||g' | sed ':a;N;$!ba;s/\n/ /g'} - # echo "Modified services: $modified_services" - # echo "modified_services=$modified_services" >> $GITHUB_OUTPUT - name: Gotify Notification uses: eikendev/gotify-action@master with: From 5fa8a8229e7128d51aa7aa8d55f53207453b0e56 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:29:47 -0400 Subject: [PATCH 4/8] Fixing pipeline names. --- .gitea/workflows/pr-ansible-config-deployment.yaml | 2 +- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-ansible-config-deployment.yaml b/.gitea/workflows/pr-ansible-config-deployment.yaml index 8ba7f305..25f4e2ac 100644 --- a/.gitea/workflows/pr-ansible-config-deployment.yaml +++ b/.gitea/workflows/pr-ansible-config-deployment.yaml @@ -1,4 +1,4 @@ -name: Gitea Branch PR, Cloudflare DNS, README generation, & Ansible/Docker Deployment +name: Gitea Branch PR & Ansible Deployment on: push: branches-ignore: diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 10130e81..5c052581 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -1,4 +1,4 @@ -name: Gitea Branch PR, Cloudflare DNS, README generation, & Ansible/Docker Deployment +name: Gitea Branch PR, Cloudflare DNS, README generation, & Docker Deployment on: push: branches-ignore: From 6e34477f1559b6fa93202706fb73e3e09a8616bd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:24:05 -0400 Subject: [PATCH 5/8] Adding pipeline exclusively for Ansible. --- .../pr-ansible-config-deployment.yaml | 192 ++++++++++++++++++ 1 file changed, 192 insertions(+) create mode 100644 .gitea/workflows/pr-ansible-config-deployment.yaml diff --git a/.gitea/workflows/pr-ansible-config-deployment.yaml b/.gitea/workflows/pr-ansible-config-deployment.yaml new file mode 100644 index 00000000..8ba7f305 --- /dev/null +++ b/.gitea/workflows/pr-ansible-config-deployment.yaml @@ -0,0 +1,192 @@ +name: Gitea Branch PR, Cloudflare DNS, README generation, & Ansible/Docker Deployment +on: + push: + branches-ignore: + - 'main' + paths: + - '**.j2' + - 'ansible/**.yml' +jobs: + check-and-create-pr: + if: github.ref != 'refs/heads/main' + name: Check and Create PR + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + fetch-depth: 1 + - name: Cache tea CLI + id: cache-tea + uses: actions/cache@v4 + with: + path: /opt/hostedtoolcache/tea/0.9.2/x64 + key: tea-${{ runner.os }}-0.9.2 + - name: Install tea + uses: supplypike/setup-bin@v4 + with: + uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64' + name: 'tea' + version: '0.9.2' + - 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 ${{ 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 "Automated PR for ${{ github.ref_name }} - #${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} -L "Docker Compose, Ansible Configs.j2" + - 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 🎟️' + ansible-linting: + name: Docker Compose & Ansible Lints + needs: [check-and-create-pr] + runs-on: ubuntu-latest + env: + VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} + VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} + VAULT_NAMESPACE: "" + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Fetch base branch + run: | + git fetch origin ${{ github.event.pull_request.base.ref }} + - name: Cache Ansible Galaxy Collections + uses: actions/cache@v3 + with: + path: ansible/collections + key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }} + restore-keys: | + ${{ runner.os }}-ansible- + - name: Install Ansible + uses: alex-oleshkevich/setup-ansible@v1.0.1 + with: + version: "11.0.0" + - name: Install Vault + uses: cpanato/vault-installer@main + - name: Install hvac + run: pip install hvac + - 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: Ansible Config Dry Run @ Rinoa' + notification_message: 'Starting Ansible dry run...' + - name: Ansible Playbook Dry Run + uses: arillso/action.playbook@0.1.0 + with: + check: true + galaxy_collections_path: ansible/collections + galaxy_requirements_file: ansible/collections/requirements.yml + inventory: ansible/inventory/hosts.yml + playbook: ansible/docker_config_deploy.yml + private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }} + vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }} + verbose: 0 + - 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: Docker Compose Dry Run @ Rinoa' + notification_message: 'Docker Compose dry run completed successfully.' + pr-merge: + name: PR Merge + needs: [regenerate-readme-modified-services] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Install tea + uses: supplypike/setup-bin@v4 + with: + uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64' + name: 'tea' + version: '0.9.2' + - 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 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.' + ansible-config-docker-compose-deploy: + name: Ansible Configs & Docker Compose Deployment + runs-on: ubuntu-latest + needs: [pr-merge] + env: + VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} + VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} + DOCKER_HOST: tcp://dockerproxy:2375 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: main + - name: Cache Vault install + id: cache-vault + uses: actions/cache@v4 + with: + path: /opt/hostedtoolcache/vault/1.18.0/x64 + key: vault-${{ runner.os }}-1.18.0 + - name: Install Ansible + uses: alex-oleshkevich/setup-ansible@v1.0.1 + with: + version: "11.0.0" + - name: Install Vault + uses: cpanato/vault-installer@main + - name: Install hvac + run: pip install hvac + - 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: Ansible Config Deployment @ Rinoa' + notification_message: 'Starting config deployment with Ansible...' + - name: Ansible Playbook Dry Run + uses: arillso/action.playbook@0.1.0 + with: + check: false + galaxy_collections_path: ansible/collections + galaxy_requirements_file: ansible/collections/requirements.yml + inventory: ansible/inventory/hosts.yml + playbook: ansible/docker_config_deploy.yml + private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }} + vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }} + - 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: Ansible Config Deployment @ Rinoa' + notification_message: 'Deployment completed successfully.' \ No newline at end of file From daff8cac3379ea92a843bd84ce95c3c8f8c6f809 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:24:06 -0400 Subject: [PATCH 6/8] Removing Ansible steps from pipeline. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 46695e01..10130e81 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -4,7 +4,7 @@ on: branches-ignore: - 'main' paths: - - '**.yml' + - '**/docker-compose.yml' - '!ansible/**.yml' jobs: check-and-create-pr: @@ -258,20 +258,6 @@ jobs: uses: actions/checkout@v4 - name: Install yq uses: dcarbone/install-yq-action@v1 - # - name: Fetch main branch for comparison - # run: | - # git fetch origin main:main - # - name: Compare services using yq - # continue-on-error: true - # id: compare-services - # run: | - # current_services=$(yq '.services | to_entries' docker-compose.yml) - # git show main:docker-compose.yml > main_compose.yml - # main_services=$(yq '.services | to_entries' main_compose.yml) - # modified_services_file=$(comm -13 <(echo "$main_services") <(echo "$current_services") > changes_compose.yml) - # modified_services=${egrep '^ [a-z]' changes.yml | sed -e 's|^ ||g' -e 's|:||g' | sed ':a;N;$!ba;s/\n/ /g'} - # echo "Modified services: $modified_services" - # echo "modified_services=$modified_services" >> $GITHUB_OUTPUT - name: Gotify Notification uses: eikendev/gotify-action@master with: From 6920ff6201111dd8204b4810af8e2c340a769101 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:29:47 -0400 Subject: [PATCH 7/8] Fixing pipeline names. --- .gitea/workflows/pr-ansible-config-deployment.yaml | 2 +- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-ansible-config-deployment.yaml b/.gitea/workflows/pr-ansible-config-deployment.yaml index 8ba7f305..25f4e2ac 100644 --- a/.gitea/workflows/pr-ansible-config-deployment.yaml +++ b/.gitea/workflows/pr-ansible-config-deployment.yaml @@ -1,4 +1,4 @@ -name: Gitea Branch PR, Cloudflare DNS, README generation, & Ansible/Docker Deployment +name: Gitea Branch PR & Ansible Deployment on: push: branches-ignore: diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 10130e81..5c052581 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -1,4 +1,4 @@ -name: Gitea Branch PR, Cloudflare DNS, README generation, & Ansible/Docker Deployment +name: Gitea Branch PR, Cloudflare DNS, README generation, & Docker Deployment on: push: branches-ignore: From 040251b3e02b083a36190da3156d07e9d01e25c5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 19 May 2025 07:47:12 -0400 Subject: [PATCH 8/8] Correction in vault unseal pipeline. --- .gitea/workflows/vault-auto-unseal-flow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/vault-auto-unseal-flow.yml b/.gitea/workflows/vault-auto-unseal-flow.yml index da49d543..c67eabd8 100644 --- a/.gitea/workflows/vault-auto-unseal-flow.yml +++ b/.gitea/workflows/vault-auto-unseal-flow.yml @@ -1,6 +1,5 @@ name: Auto-Unseal for Vault on: - push: schedule: - cron: "30 2 * * *" jobs: