From 7dca2acd3f128b00b8a98790edc790a485b09a6d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 16:12:06 -0400 Subject: [PATCH] Secrets and vars corrections. --- .gitea/workflows/pr-docker-deploy.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 251ac1b..1cd2c94 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -8,7 +8,7 @@ on: paths: - 'docker-compose.misc.yml' - 'compose/docker-compose*.yml' - - 'compose/.env*' + - '**/pr-docker-deploy.yml' env: HC_VAULT_VERSION: '1.20.0' @@ -42,8 +42,8 @@ jobs: - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' + gotify_api_base: '${{ secrets.GOTIFY_URL }}' + gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' notification_title: 'GITEA: PR Check' notification_message: 'Checking for existing PR... 🔍' @@ -51,7 +51,7 @@ jobs: 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 }} + tea login add --name gitea-rinoa --url "${{ secrets.BDIKTA_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 '\[DOCKER\].*${{ github.ref_name }}' | tail -1 | wc -l) echo "exists=$pr_exists" >> $GITHUB_OUTPUT @@ -66,8 +66,8 @@ jobs: - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' + gotify_api_base: '${{ secrets.GOTIFY_URL }}' + gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' notification_title: 'GITEA: PR Check' notification_message: 'PR Created 🎟️' @@ -89,8 +89,8 @@ jobs: - name: Gotify Notification uses: eikendev/gotify-action@master with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' + gotify_api_base: '${{ secrets.GOTIFY_URL }}' + gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' notification_title: 'GITEA: Services TBD' notification_message: 'Generating list of services to deploy...' @@ -217,11 +217,11 @@ jobs: uses: cssnr/stack-deploy-action@v1.3.2 with: mode: compose - file: $ {{ steps.compose_file_list.outputs.compose_list }} + file: ${{ steps.compose_file_list.outputs.compose_list }} name: 'ovosmisc' host: 192.168.1.252 user: ovos - ssh_key: ${{ secrets.BENEDIKTA_SSH_PRIVATE_KEY }} + ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} args: --remove-orphans -d --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: '.env' registry_host: 'ghcr.io'