[bot] update konflux configuration

openshift-pipelines · Dec 13, 2024 · a1d89bf · a1d89bf
1 parent 8f912be
commit a1d89bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/update-sources.main.yaml b/.github/workflows/update-sources.main.yaml
@@ -33,6 +33,7 @@ jobs:
       run: |
         pushd upstream
 
+        rm ../.konflux/patches/0000-go1.22.patch || true
         sed -i "s%go 1.22.*%go 1.22%g" go.mod
         sed -i "s%go 1.22.*%go 1.22%g" vendor/modules.txt
         if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
@@ -45,6 +46,7 @@ jobs:
         git checkout HEAD go.mod vendor/modules.txt
         
 
+        rm ../.konflux/patches/0000-go1.23.patch || true
         sed -i "s%go 1.23.*%go 1.22%g" go.mod
         sed -i "s%go 1.23.*%go 1.22%g" vendor/modules.txt
         if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
@@ -86,7 +88,7 @@ jobs:
         [bot] Update main from tektoncd/chains to ${NEW_COMMIT}
 
             $ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
-        $(cat /tmp/diff.txt | sed 's/^/    /')
+        $(cat /tmp/diff.txt | sed 's/^/    /' | head -c 100)
         
         https://github.com/tektoncd/chains/compare/${NEW_COMMIT}..${OLD_COMMIT}
         EOF

diff --git a/.github/workflows/update-sources.next.yaml b/.github/workflows/update-sources.next.yaml
@@ -33,6 +33,7 @@ jobs:
       run: |
         pushd upstream
 
+        rm ../.konflux/patches/0000-go1.22.patch || true
         sed -i "s%go 1.22.*%go 1.22%g" go.mod
         sed -i "s%go 1.22.*%go 1.22%g" vendor/modules.txt
         if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
@@ -45,6 +46,7 @@ jobs:
         git checkout HEAD go.mod vendor/modules.txt
         
 
+        rm ../.konflux/patches/0000-go1.23.patch || true
         sed -i "s%go 1.23.*%go 1.22%g" go.mod
         sed -i "s%go 1.23.*%go 1.22%g" vendor/modules.txt
         if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
@@ -86,7 +88,7 @@ jobs:
         [bot] Update next from tektoncd/chains to ${NEW_COMMIT}
 
             $ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
-        $(cat /tmp/diff.txt | sed 's/^/    /')
+        $(cat /tmp/diff.txt | sed 's/^/    /' | head -c 100)
         
         https://github.com/tektoncd/chains/compare/${NEW_COMMIT}..${OLD_COMMIT}
         EOF