Skip to content

Commit a0c55ec

Browse files
committed
fix: Update workflow for v1
1 parent 3b824db commit a0c55ec

File tree

4 files changed

+8
-52
lines changed

4 files changed

+8
-52
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- main
7-
- v2
7+
- v1
88
paths:
99
- 'src/**'
1010
- 'tests/**'

.github/workflows/docs-deploy.yml

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ concurrency: "docs-deploy"
44
on:
55
push:
66
branches:
7-
- stable
7+
- v1
88
paths:
99
- 'docs/**'
1010

1111
workflow_run:
12-
branches: [ main ]
12+
branches: [ v1 ]
1313
workflows: [ 'release' ]
1414
types: [ completed ]
1515

@@ -25,7 +25,7 @@ env:
2525
jobs:
2626
deploy:
2727
name: 📃 Deploy new version bunit.dev
28-
if: github.ref == 'refs/heads/stable' || ${{ github.event.workflow_run.conclusion == 'success' }}
28+
if: github.ref == 'refs/heads/v1' || ${{ github.event.workflow_run.conclusion == 'success' }}
2929
runs-on: ubuntu-latest
3030
steps:
3131

@@ -100,33 +100,11 @@ jobs:
100100
with:
101101
build_dir: docs/site/_site
102102
fqdn: bunit.dev
103-
repo: bUnit-dev/bUnit-dev.github.io
103+
repo: bUnit-dev/v1.bunit.dev
104104
target_branch: main
105105
keep_history: false
106106
jekyll: false
107107
committer: "bUnit bot <[email protected]>"
108108
env:
109109
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110110
GH_PAT: ${{ secrets.BUNIT_BOT_TOKEN }}
111-
112-
- name: ⏩ Merge stable with main, push origin
113-
id: mergeMainline
114-
continue-on-error: true
115-
run: |
116-
git checkout main
117-
git merge -S stable
118-
git push origin main
119-
120-
- name: ⏭ Create pull request from stable to main when direct merge fails
121-
if: steps.mergeMainline.outcome == 'failure'
122-
uses: thomaseizinger/[email protected]
123-
with:
124-
github_token: ${{ secrets.BUNIT_BOT_TOKEN }}
125-
head: stable
126-
base: main
127-
title: Update main with documentation in stable
128-
reviewers: ${{ github.actor }} # By default, we request a review from the person who triggered the workflow.
129-
body: |
130-
Hi @${{ github.actor }}
131-
132-
This PR was created because the [docs-deploy](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) failed to automatically merge stable into main.

.github/workflows/prepare-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
prepare-release:
1414
name: 🚚 Prepare new release
1515
runs-on: ubuntu-latest
16-
if: github.ref == 'refs/heads/main' && contains(fromJson('["major","minor"]'), github.event.inputs.versionIncrement)
16+
if: github.ref == 'refs/heads/v1' && contains(fromJson('["major","minor"]'), github.event.inputs.versionIncrement)
1717
steps:
1818
- name: 🛒 Checkout repository
1919
uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ concurrency: 'release'
44
on:
55
pull_request:
66
branches:
7-
- stable
7+
- v1
88
types:
99
- closed
1010
paths-ignore:
@@ -23,7 +23,7 @@ jobs:
2323
release:
2424
name: 🎁 Publish new release
2525
# Only run on manual dispatch or on merged 'release-' pull requests
26-
if: github.ref == 'refs/heads/stable' ||
26+
if: github.ref == 'refs/heads/v1' ||
2727
github.event.pull_request.merged == true && contains(github.head_ref, 'release/v') == true
2828
runs-on: ubuntu-latest
2929
steps:
@@ -117,25 +117,3 @@ jobs:
117117
draft: false
118118
prerelease: ${{ steps.nbgv.outputs.PublicRelease == 'False' }}
119119
github_token: ${{ secrets.GITHUB_TOKEN }}
120-
121-
- name: ⏩ Merge stable with main, push to origin
122-
id: mergeMainline
123-
continue-on-error: true
124-
run: |
125-
git checkout main
126-
git merge -S stable
127-
git push origin main
128-
129-
- name: ⏭ Create pull request from stable to main when direct merge fails
130-
if: steps.mergeMainline.outcome == 'failure'
131-
uses: thomaseizinger/[email protected]
132-
with:
133-
github_token: ${{ secrets.BUNIT_BOT_TOKEN }}
134-
head: stable
135-
base: main
136-
title: Update main with changes in stable after v${{ steps.nbgv.outputs.SemVer2 }} release
137-
reviewers: ${{ github.actor }} # By default, we request a review from the person who triggered the workflow.
138-
body: |
139-
Hi @${{ github.actor }}
140-
141-
This PR was created because the [release workflow](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) failed to automatically merge stable into main.

0 commit comments

Comments
 (0)