From a0c7d8a67ed33abf2a7b6fd4da834b5be90cf46e Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Wed, 9 Aug 2023 11:13:19 -0700
Subject: [PATCH 1/5] ci: Preliminary support for GitHub merge queues

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 407b2c7..65efe16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: Merge
 
 on:
+  merge_group:
   push:
     branches:
       - staging
@@ -120,7 +121,7 @@ jobs:
     name: Publish
     needs: [test-ok, version-check, info]
     uses: ./.github/workflows/ci-publish.yml
-    if: ${{ github.ref_name == 'staging' }}
+    if: github.ref_name == 'staging' || github.event_name == 'merge_group'
     with:
       version: ${{ needs.info.outputs.version }}
       release_notes: ${{ needs.info.outputs.release_notes }}

From 1e37ab9a94e62db16b6d84ea5da079b98350c810 Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Wed, 9 Aug 2023 11:20:07 -0700
Subject: [PATCH 2/5] update actionlint

---
 .github/workflows/ci-lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml
index 8ab449c..706e587 100644
--- a/.github/workflows/ci-lint.yml
+++ b/.github/workflows/ci-lint.yml
@@ -22,5 +22,5 @@ jobs:
       - run: |
           # These vars are format strings.
           # shellcheck disable=SC2016
-          go run github.com/rhysd/actionlint/cmd/actionlint@v1.6.15 \
+          go run github.com/rhysd/actionlint/cmd/actionlint@v1.6.25 \
             -format '{{range $err := .}}::error file={{$err.Filepath}},line={{$err.Line}},col={{$err.Column}}::{{$err.Message}}%0A```%0A{{replace $err.Snippet "\\n" "%0A"}}%0A```\n{{end}}' -ignore 'SC2016:'

From 8ae92607fe6a56f2f8118ffc6cc443031415849b Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Wed, 9 Aug 2023 12:11:12 -0700
Subject: [PATCH 3/5] update cargo-install

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65efe16..214991f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,11 +31,11 @@ jobs:
 
           ./.github/scripts/set-output version "${VERSION}"
       - name: Install git-cliff
-        uses: baptiste0928/cargo-install@bf6758885262d0e6f61089a9d8c8790d3ac3368f # v1.3.0
+        uses: baptiste0928/cargo-install@v2
         with:
           crate: git-cliff
-          args: --git https://github.com/AaronFriel/git-cliff --rev 702c79236ef0b0a3d2430f73902db3339933fbfd
-          version: 0.8.1
+          git: https://github.com/AaronFriel/git-cliff
+          rev: 702c79236ef0b0a3d2430f73902db3339933fbfd
       - name: Extract release notes
         id: notes
         shell: bash

From 4f255de00d47b7296952e7f559751b21bd2724c9 Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Wed, 9 Aug 2023 12:29:14 -0700
Subject: [PATCH 4/5] s/rev/commit

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 214991f..a81fe93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           crate: git-cliff
           git: https://github.com/AaronFriel/git-cliff
-          rev: 702c79236ef0b0a3d2430f73902db3339933fbfd
+          commit: 702c79236ef0b0a3d2430f73902db3339933fbfd
       - name: Extract release notes
         id: notes
         shell: bash

From 182e86d00ea9c4d0668e887766f7abe5c32521a6 Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Wed, 9 Aug 2023 12:33:29 -0700
Subject: [PATCH 5/5] missed a spot

---
 .github/workflows/pr-check-commit-changelog.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-check-commit-changelog.yml b/.github/workflows/pr-check-commit-changelog.yml
index d0676a4..ae813c1 100644
--- a/.github/workflows/pr-check-commit-changelog.yml
+++ b/.github/workflows/pr-check-commit-changelog.yml
@@ -25,11 +25,11 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install git-cliff
-        uses: baptiste0928/cargo-install@bf6758885262d0e6f61089a9d8c8790d3ac3368f # v1.3.0
+        uses: baptiste0928/cargo-install@v2
         with:
           crate: git-cliff
-          args: --git https://github.com/AaronFriel/git-cliff --rev 702c79236ef0b0a3d2430f73902db3339933fbfd
-          version: 0.8.1
+          git: https://github.com/AaronFriel/git-cliff
+          commit: 702c79236ef0b0a3d2430f73902db3339933fbfd
       - name: Changelog
         id: changelog
         env: