From a5ece4f205944731cd1512a2b6a6e38176314d15 Mon Sep 17 00:00:00 2001 From: pgijsbertsen <117165507+pgijsbertsen@users.noreply.github.com> Date: Fri, 29 May 2026 11:52:59 +0200 Subject: [PATCH 1/2] revert --- .forgejo/workflows/argocd-diff-preview.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.forgejo/workflows/argocd-diff-preview.yaml b/.forgejo/workflows/argocd-diff-preview.yaml index 725d8a8..ae5e61e 100644 --- a/.forgejo/workflows/argocd-diff-preview.yaml +++ b/.forgejo/workflows/argocd-diff-preview.yaml @@ -25,10 +25,6 @@ jobs: ref: main path: main - - name: Get changed files - id: changed-files - uses: https://github.com/tj-actions/changed-files@v45 - - name: Install Docker CLI run: | if command -v apt-get &>/dev/null; then @@ -48,7 +44,6 @@ jobs: -v $(pwd)/output:/output \ -e TARGET_BRANCH=refs/pull/$PR_NUMBER/merge \ -e REPO=${{ forge.repository }} \ - -e FILES_CHANGED="${{ steps.changed-files.outputs.all_changed_files }}" \ dagandersen/argocd-diff-preview:v0.2.8 - name: Add comment From 8485ce2b1f1e7bf0e83f64d8fbdc838baef4c9fe Mon Sep 17 00:00:00 2001 From: pgijsbertsen <117165507+pgijsbertsen@users.noreply.github.com> Date: Fri, 29 May 2026 12:15:45 +0200 Subject: [PATCH 2/2] huh --- .forgejo/workflows/argocd-diff-preview.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/argocd-diff-preview.yaml b/.forgejo/workflows/argocd-diff-preview.yaml index ae5e61e..36c6e8a 100644 --- a/.forgejo/workflows/argocd-diff-preview.yaml +++ b/.forgejo/workflows/argocd-diff-preview.yaml @@ -35,13 +35,16 @@ jobs: - name: Generate Diff run: | - mkdir -p $(pwd)/output - docker run \ + CONTAINER_ID=$(docker inspect --format='{{.Id}}' "$HOSTNAME") + docker cp "$CONTAINER_ID:$(pwd)/main" /tmp/argocd-main + docker cp "$CONTAINER_ID:$(pwd)/pull-request" /tmp/argocd-pr + mkdir -p output + docker run --rm \ --network=host \ -v /var/run/docker.sock:/var/run/docker.sock \ - -v $(pwd)/main:/base-branch \ - -v $(pwd)/pull-request:/target-branch \ - -v $(pwd)/output:/output \ + -v /tmp/argocd-main:/base-branch \ + -v /tmp/argocd-pr:/target-branch \ + -v /tmp/argocd-output:/output \ -e TARGET_BRANCH=refs/pull/$PR_NUMBER/merge \ -e REPO=${{ forge.repository }} \ dagandersen/argocd-diff-preview:v0.2.8