From f81ba23d8a5167cdeaede55a490d0346e0cd6759 Mon Sep 17 00:00:00 2001 From: tischrei Date: Mon, 11 Aug 2025 08:30:46 +0000 Subject: [PATCH 1/5] change workflow --- .gitea/workflows/create-weekly-analytics-stats.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/create-weekly-analytics-stats.yaml b/.gitea/workflows/create-weekly-analytics-stats.yaml index 5748018..c6f87bd 100644 --- a/.gitea/workflows/create-weekly-analytics-stats.yaml +++ b/.gitea/workflows/create-weekly-analytics-stats.yaml @@ -52,10 +52,11 @@ jobs: run: | git config --global user.name "gitea-actions[bot]" git config --global user.email "actions@users.noreply.local" + git checkout -B analytics-update git add analytics/ if git diff --cached --quiet; then echo "No changes to commit" else git commit -m "chore: update analytics data [skip ci]" - git push + git push origin analytics-update --force fi -- 2.34.1 From 03072ec4c0c088f0fa6ff113a3335bfcbb3792d0 Mon Sep 17 00:00:00 2001 From: tischrei Date: Mon, 11 Aug 2025 08:44:25 +0000 Subject: [PATCH 2/5] add PR --- .../create-weekly-analytics-stats.yaml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/create-weekly-analytics-stats.yaml b/.gitea/workflows/create-weekly-analytics-stats.yaml index c6f87bd..3558fff 100644 --- a/.gitea/workflows/create-weekly-analytics-stats.yaml +++ b/.gitea/workflows/create-weekly-analytics-stats.yaml @@ -49,14 +49,30 @@ jobs: --limit "10" - name: Commit and push results + id: commit_step run: | git config --global user.name "gitea-actions[bot]" git config --global user.email "actions@users.noreply.local" git checkout -B analytics-update git add analytics/ if git diff --cached --quiet; then - echo "No changes to commit" + echo "ANALYTICS_CHANGES=false" >> $GITEA_ENV else - git commit -m "chore: update analytics data [skip ci]" + git commit -m "chore: update analytics data" git push origin analytics-update --force + echo "ANALYTICS_CHANGES=true" >> $GITEA_ENV fi + + - name: Create Pull Request in Gitea + if: env.ANALYTICS_CHANGES == 'true' + run: | + curl -X POST \ + -H "Content-Type: application/json" \ + -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ + https://gitea.eco.tsi-dev.otc-service.com/api/v1/repos/infra/otc-metadata-rework/pulls \ + -d '{ + "title": "chore: weekly update analytics data", + "head": "analytics-update", + "base": "main", + "body": "Auto-Update of Analytics-data" + }' -- 2.34.1 From e1ca8478688e34cc05a056d0c06b665e97f8630c Mon Sep 17 00:00:00 2001 From: tischrei Date: Mon, 11 Aug 2025 09:04:08 +0000 Subject: [PATCH 3/5] tune workflow --- .gitea/workflows/create-weekly-analytics-stats.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/create-weekly-analytics-stats.yaml b/.gitea/workflows/create-weekly-analytics-stats.yaml index 3558fff..4a1cc10 100644 --- a/.gitea/workflows/create-weekly-analytics-stats.yaml +++ b/.gitea/workflows/create-weekly-analytics-stats.yaml @@ -56,20 +56,20 @@ jobs: git checkout -B analytics-update git add analytics/ if git diff --cached --quiet; then - echo "ANALYTICS_CHANGES=false" >> $GITEA_ENV + echo "ANALYTICS_CHANGES=false" >> $GITHUB_OUTPUT else git commit -m "chore: update analytics data" git push origin analytics-update --force - echo "ANALYTICS_CHANGES=true" >> $GITEA_ENV + echo "ANALYTICS_CHANGES=true" >> $GITHUB_OUTPUT fi - name: Create Pull Request in Gitea - if: env.ANALYTICS_CHANGES == 'true' + if: steps.commit_step.outputs.ANALYTICS_CHANGES == 'true' run: | curl -X POST \ -H "Content-Type: application/json" \ -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ - https://gitea.eco.tsi-dev.otc-service.com/api/v1/repos/infra/otc-metadata-rework/pulls \ + https://gitea.example/api/v1/repos/org/repo/pulls \ -d '{ "title": "chore: weekly update analytics data", "head": "analytics-update", -- 2.34.1 From 7279e5e043f865ef12c9501af99ee7ed1b1af7b1 Mon Sep 17 00:00:00 2001 From: tischrei Date: Mon, 11 Aug 2025 09:09:13 +0000 Subject: [PATCH 4/5] fix url --- .gitea/workflows/create-weekly-analytics-stats.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/create-weekly-analytics-stats.yaml b/.gitea/workflows/create-weekly-analytics-stats.yaml index 4a1cc10..676f0a1 100644 --- a/.gitea/workflows/create-weekly-analytics-stats.yaml +++ b/.gitea/workflows/create-weekly-analytics-stats.yaml @@ -69,10 +69,10 @@ jobs: curl -X POST \ -H "Content-Type: application/json" \ -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ - https://gitea.example/api/v1/repos/org/repo/pulls \ + https://gitea.eco.tsi-dev.otc-service.com/api/v1/repos/infra/otc-metadata-rework/pulls \ -d '{ - "title": "chore: weekly update analytics data", + "title": "chore: update analytics data", "head": "analytics-update", "base": "main", - "body": "Auto-Update of Analytics-data" + "body": "Automatisches Update der Analytics-Daten" }' -- 2.34.1 From 1bce8fbfcea785b09b7563892fbe6d885cb9c026 Mon Sep 17 00:00:00 2001 From: tischrei Date: Mon, 11 Aug 2025 09:19:51 +0000 Subject: [PATCH 5/5] fix analytics --- .../workflows/create-weekly-analytics-stats.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.gitea/workflows/create-weekly-analytics-stats.yaml b/.gitea/workflows/create-weekly-analytics-stats.yaml index 676f0a1..b48df1d 100644 --- a/.gitea/workflows/create-weekly-analytics-stats.yaml +++ b/.gitea/workflows/create-weekly-analytics-stats.yaml @@ -56,23 +56,7 @@ jobs: git checkout -B analytics-update git add analytics/ if git diff --cached --quiet; then - echo "ANALYTICS_CHANGES=false" >> $GITHUB_OUTPUT else git commit -m "chore: update analytics data" git push origin analytics-update --force - echo "ANALYTICS_CHANGES=true" >> $GITHUB_OUTPUT fi - - - name: Create Pull Request in Gitea - if: steps.commit_step.outputs.ANALYTICS_CHANGES == 'true' - run: | - curl -X POST \ - -H "Content-Type: application/json" \ - -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ - https://gitea.eco.tsi-dev.otc-service.com/api/v1/repos/infra/otc-metadata-rework/pulls \ - -d '{ - "title": "chore: update analytics data", - "head": "analytics-update", - "base": "main", - "body": "Automatisches Update der Analytics-Daten" - }' -- 2.34.1