mirror of
https://github.com/oxalica/rust-overlay.git
synced 2024-10-04 05:07:13 +03:00
Try to fix CI
This commit is contained in:
parent
f57cc2de0d
commit
9391a9f23d
8
.github/workflows/update-stable.yaml
vendored
8
.github/workflows/update-stable.yaml
vendored
@ -30,18 +30,16 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
fetch-depth: 0
|
||||
ref: stable
|
||||
|
||||
- name: Do we have updates other than nightly or beta?
|
||||
id: check-non-nightly-update
|
||||
continue-on-error: true
|
||||
run: |
|
||||
git diff --name-only stable master | grep -v -E 'manifests/(nightly|beta)|docs|README'
|
||||
run: git diff --name-only stable origin/master -- | grep -v -E 'manifests/(nightly|beta)|docs|README'
|
||||
|
||||
- name: Forward stable -> master
|
||||
if: steps.check-non-nightly-update.outcome == 'success'
|
||||
run: |
|
||||
git checkout stable
|
||||
git merge --ff-only master
|
||||
run: git merge --ff-only origin/master
|
||||
|
||||
- name: Push changes
|
||||
if: steps.check-non-nightly-update.outcome == 'success'
|
||||
|
Loading…
Reference in New Issue
Block a user