Skip to content

Commit 3a55d22

Browse files
Copilotjeduden
andauthored
Add fixed-version merge-driver compatibility job to CI
Agent-Logs-Url: https://github.com/jeduden/mdsmith/sessions/a79f59e6-e545-4516-8da6-e661bc483b47 Co-authored-by: jeduden <1117699+jeduden@users.noreply.github.com>
1 parent 3f5b1a6 commit 3a55d22

1 file changed

Lines changed: 22 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,28 @@ jobs:
175175
- run: go build -o mdsmith ./cmd/mdsmith
176176
- run: ./mdsmith check .
177177

178+
merge-driver-fixed-version:
179+
runs-on: ubuntu-latest
180+
steps:
181+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
182+
with:
183+
persist-credentials: false
184+
- name: Install fixed mdsmith release used by merge-queue
185+
env:
186+
# Keep in lockstep with .github/workflows/merge-queue.yml.
187+
MDSMITH_VERSION: v0.15.0
188+
MDSMITH_SHA256: e91115916132c668620bb605bd162c05343aad26c3ed2c25e58c86a8506af191
189+
run: |
190+
mkdir -p "$HOME/.local/bin"
191+
curl -fsSL "https://github.com/jeduden/mdsmith/releases/download/${MDSMITH_VERSION}/mdsmith-linux-amd64" \
192+
-o "$HOME/.local/bin/mdsmith"
193+
echo "${MDSMITH_SHA256} $HOME/.local/bin/mdsmith" | sha256sum -c
194+
chmod +x "$HOME/.local/bin/mdsmith"
195+
"$HOME/.local/bin/mdsmith" merge-driver install
196+
"$HOME/.local/bin/mdsmith" pre-merge-commit install
197+
- name: Fail if fixed-version merge tooling rewrites tracked files
198+
run: git --no-pager diff --exit-code
199+
178200
demo:
179201
uses: ./.github/workflows/record-demo.yml
180202
with:

0 commit comments

Comments
 (0)