From 6a10afc21f31a015d0ce7fccb9040a1880134ef9 Mon Sep 17 00:00:00 2001 From: openshift-pipelines-bot Date: Tue, 17 Dec 2024 10:10:02 +0000 Subject: [PATCH] [bot] update konflux configuration --- .github/workflows/update-sources.main.yaml | 32 ---------------------- .github/workflows/update-sources.next.yaml | 32 ---------------------- 2 files changed, 64 deletions(-) diff --git a/.github/workflows/update-sources.main.yaml b/.github/workflows/update-sources.main.yaml index 63e262a789..d6d2f6d8b9 100644 --- a/.github/workflows/update-sources.main.yaml +++ b/.github/workflows/update-sources.main.yaml @@ -29,38 +29,6 @@ jobs: popd - - name: Generate patches - 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 - echo "No change, exiting" - exit 0 - else - git diff > ../.konflux/patches/0000-go1.22.patch - fi - # clean after yourself >:D - 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 - echo "No change, exiting" - exit 0 - else - git diff > ../.konflux/patches/0000-go1.23.patch - fi - # clean after yourself >:D - git checkout HEAD go.mod vendor/modules.txt - - - popd - - name: Commit new changes run: | git config user.name openshift-pipelines-bot diff --git a/.github/workflows/update-sources.next.yaml b/.github/workflows/update-sources.next.yaml index 8fa904ee2a..76c151fa3a 100644 --- a/.github/workflows/update-sources.next.yaml +++ b/.github/workflows/update-sources.next.yaml @@ -29,38 +29,6 @@ jobs: popd - - name: Generate patches - 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 - echo "No change, exiting" - exit 0 - else - git diff > ../.konflux/patches/0000-go1.22.patch - fi - # clean after yourself >:D - 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 - echo "No change, exiting" - exit 0 - else - git diff > ../.konflux/patches/0000-go1.23.patch - fi - # clean after yourself >:D - git checkout HEAD go.mod vendor/modules.txt - - - popd - - name: Commit new changes run: | git config user.name openshift-pipelines-bot