tree: import changes from testing-devel at 8d4ace160f

.github/workflows/add-override.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Install dependencies
         run: dnf install -y git jq python3-bodhi-client python3-pyyaml
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.target }}
           # We need an unbroken commit chain when pushing to the fork.  Don't
@@ -80,7 +80,7 @@ jobs:
           echo "COMMIT_TITLE=${title}" >> ${GITHUB_ENV}
           echo "PR_TITLE=${pr_title}" >> ${GITHUB_ENV}
       - name: Open pull request
-        uses: peter-evans/create-pull-request@v3.8.2
+        uses: peter-evans/create-pull-request@v4.2.3
         with:
           token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
           branch: ${{ env.BRANCH_NAME }}

.github/workflows/next-devel.yml

@@ -19,13 +19,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Post PR comment
-        uses: actions/github-script@v3
+        uses: actions/github-script@v6
         with:
           script: |
             const url = 'https://raw.githubusercontent.com/coreos/fedora-coreos-pipeline/main/next-devel/status.json'
             const resp = await github.request(url)
             if (!JSON.parse(resp.data).enabled) {
-              await github.issues.createComment({
+              await github.rest.issues.createComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: context.issue.number,

.github/workflows/openshift-os.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: openshift/os
           # We need an unbroken commit chain when pushing to the fork.  Don't
@@ -53,14 +53,7 @@ jobs:
               echo "No non-trivial changes; exiting"
               exit 0
           fi
-
-          base=$(git rev-parse HEAD)
           git checkout testing-devel
-          # Hack: update a stamp to force create-pull-request to update the
-          # branch, even if we're just rebasing on a previous manual
-          # fedora-coreos-config sync
-          # https://github.com/peter-evans/create-pull-request/issues/1191
-          echo $base > ../.fedora-coreos-config-base
 
           marker=OPENSHIFT-OS-END-OF-LOG-MARKER-$RANDOM$RANDOM$RANDOM
           cat >> $GITHUB_ENV <<EOF
@@ -70,7 +63,7 @@ jobs:
           EOF
 
       - name: Open pull request
-        uses: peter-evans/create-pull-request@v4.0.4
+        uses: peter-evans/create-pull-request@v4.2.3
         with:
           token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
           push-to-fork: coreosbot-releng/os

.github/workflows/promotion-diff.yml

@@ -19,17 +19,17 @@ jobs:
         run: |
           echo "ORIGIN_COMMIT=$(echo ${COMMIT_TITLE} | awk '{print $NF}')" >> $GITHUB_ENV
       - name: Check out origin commit
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: origin
           ref: ${{ env.ORIGIN_COMMIT }}
       - name: Check out base branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: base
           ref: ${{ github.base_ref }}
       - name: Check out PR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: new
       - name: Ignore manifest files

.github/workflows/remove-graduated-overrides.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install dependencies
         run: dnf install -y python3-bodhi-client rpm-ostree # see related TODO above
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ matrix.branch }}
       # https://github.com/actions/checkout/issues/766
@@ -49,7 +49,7 @@ jobs:
                 -m "Triggered by remove-graduated-overrides GitHub Action."
           fi
       - name: Open pull request
-        uses: peter-evans/create-pull-request@v3.8.2
+        uses: peter-evans/create-pull-request@v4.2.3
         with:
           token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
           branch: ${{ matrix.branch }}-graduation