From 36572264c70385dedf8635dcaba5049e824fc648 Mon Sep 17 00:00:00 2001 From: Jacob Baungard Hansen Date: Thu, 11 Sep 2025 14:58:54 +0200 Subject: [PATCH 1/4] ACM/Grafana: forcefully use upstream files - use git reset instead of git checkout to ensure that deleted upstream files are also deleted here - Add additional files to restore downstream paths Signed-off-by: Jacob Baungard Hansen --- .github/workflows/merge-acm-flow.yaml | 2 +- .github/workflows/merge-acm-grafana.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 10ca434..52f000a 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -151,7 +151,7 @@ jobs: if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}} run: | echo "reset ${{ inputs.restore-upstream }}" - git checkout --theirs ${{ inputs.restore-upstream }} || true + git reset tags/${{ steps.upstream.outputs.release }} -- ${{ inputs.restore-upstream }} || true git add ${{ inputs.restore-upstream }} || true - name: Remove deleted files if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }} diff --git a/.github/workflows/merge-acm-grafana.yaml b/.github/workflows/merge-acm-grafana.yaml index b9891be..3c4c556 100644 --- a/.github/workflows/merge-acm-grafana.yaml +++ b/.github/workflows/merge-acm-grafana.yaml @@ -27,12 +27,18 @@ jobs: restore-upstream: >- .betterer.results .drone.yml + apps CHANGELOG.md + devenv + Dockerfile docs + e2e + hack go.mod go.sum go.work go.work.sum + Makefile pkg scripts lerna.json From a1546be18beafef23ff915da106997c56e423837 Mon Sep 17 00:00:00 2001 From: Jacob Baungard Hansen Date: Thu, 11 Sep 2025 15:12:56 +0200 Subject: [PATCH 2/4] test Signed-off-by: Jacob Baungard Hansen --- .github/workflows/merge-acm-flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 52f000a..10ca434 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -151,7 +151,7 @@ jobs: if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}} run: | echo "reset ${{ inputs.restore-upstream }}" - git reset tags/${{ steps.upstream.outputs.release }} -- ${{ inputs.restore-upstream }} || true + git checkout --theirs ${{ inputs.restore-upstream }} || true git add ${{ inputs.restore-upstream }} || true - name: Remove deleted files if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }} From 801c14d6aed4b0c9af0442560a72268bbc68bdf6 Mon Sep 17 00:00:00 2001 From: Jacob Baungard Hansen Date: Thu, 11 Sep 2025 15:31:09 +0200 Subject: [PATCH 3/4] wip Signed-off-by: Jacob Baungard Hansen --- .github/workflows/merge-acm-flow.yaml | 2 +- .github/workflows/merge-acm-grafana.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 10ca434..4ac7ac0 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -151,7 +151,7 @@ jobs: if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}} run: | echo "reset ${{ inputs.restore-upstream }}" - git checkout --theirs ${{ inputs.restore-upstream }} || true + git checkout ${{ steps.upstream.outputs.release }} -- ${{ inputs.restore-upstream }} || true git add ${{ inputs.restore-upstream }} || true - name: Remove deleted files if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }} diff --git a/.github/workflows/merge-acm-grafana.yaml b/.github/workflows/merge-acm-grafana.yaml index 3c4c556..c9834c5 100644 --- a/.github/workflows/merge-acm-grafana.yaml +++ b/.github/workflows/merge-acm-grafana.yaml @@ -46,6 +46,7 @@ jobs: packages public/ yarn.lock + .yarn SECURITY.md .bingo/ assets-cmd: | From 14f92588fe436a21594ed59c5b9dcb0b8d29f0c1 Mon Sep 17 00:00:00 2001 From: Jacob Baungard Hansen Date: Thu, 11 Sep 2025 16:27:48 +0200 Subject: [PATCH 4/4] wip Signed-off-by: Jacob Baungard Hansen --- .github/workflows/merge-acm-flow.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index 4ac7ac0..0442787 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -151,7 +151,8 @@ jobs: if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}} run: | echo "reset ${{ inputs.restore-upstream }}" - git checkout ${{ steps.upstream.outputs.release }} -- ${{ inputs.restore-upstream }} || true + git reset ${{ steps.upstream.outputs.release }} -- ${{ inputs.restore-upstream }} || true + git clean -f -d || true git add ${{ inputs.restore-upstream }} || true - name: Remove deleted files if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}