Skip to content

Commit

Permalink
chore(ci): rename v1-hotfix to v1 (#1715)
Browse files Browse the repository at this point in the history
  • Loading branch information
ocavue committed Jun 10, 2022
1 parent e6d4f1c commit c495556
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: docs
on:
push:
branches:
- v1-hotfix
- v1
pull_request:
types: [opened, synchronize]
branches:
- v1-hotfix
- v1
- main

env:
Expand All @@ -17,7 +17,7 @@ jobs:
deploy_docs:
timeout-minutes: 90
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/v1-hotfix' || github.event.pull_request
if: github.ref == 'refs/heads/v1' || github.event.pull_request

steps:
- name: checkout code repository
Expand Down Expand Up @@ -64,9 +64,10 @@ jobs:
uses: nwtgck/actions-netlify@develop
with:
publish-dir: './website/build'
production-branch: v1-hotfix
production-branch: v1
github-token: ${{ secrets.GITHUB_TOKEN }}
deploy-message: 'Deploy Docs from GitHub Actions - ${{ github.event.pull_request.title || github.ref }}'
alias: ${{ github.head_ref }}
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NEXT_NETLIFY_SITE_ID }}
10 changes: 5 additions & 5 deletions .github/workflows/publish-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: publish-v1
on:
workflow_run:
workflows: [ci]
branches: [v1-hotfix]
branches: [v1]
types: [completed]

env:
Expand All @@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
ref: 'v1-hotfix'
ref: 'v1'

- name: setup caching
uses: actions/cache@v2
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: create release for @remirror/react
uses: ncipollo/release-action@v1
with:
commit: v1-hotfix
commit: v1
tag: '@remirror/react@${{ fromJSON(steps.changelog_remirror_react.outputs.parsed).versions[0].version }}'
body: '${{ fromJSON(steps.changelog_remirror_react.outputs.parsed).versions[0].body }}'
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -76,7 +76,7 @@ jobs:
- name: create release for @remirror/pm
uses: ncipollo/release-action@v1
with:
commit: v1-hotfix
commit: v1
tag: '@remirror/pm@${{ fromJSON(steps.changelog_remirror_pm.outputs.parsed).versions[0].version }}'
body: '${{ fromJSON(steps.changelog_remirror_pm.outputs.parsed).versions[0].body }}'
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -92,7 +92,7 @@ jobs:
- name: create release for remirror
uses: ncipollo/release-action@v1
with:
commit: v1-hotfix
commit: v1
tag: 'remirror@${{ fromJSON(steps.changelog_remirror.outputs.parsed).versions[0].version }}'
body: '${{ fromJSON(steps.changelog_remirror.outputs.parsed).versions[0].body }}'
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: storybook
on:
push:
branches:
- v1-hotfix
- v1
pull_request:
types: [opened, synchronize]
branches:
- v1-hotfix
- v1
- main

env:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: deploy storybook for production
uses: amondnet/vercel-action@v20
if: github.ref == 'refs/heads/v1-hotfix'
if: github.ref == 'refs/heads/v1'
with:
working-directory: ./packages/storybook-react/storybook-static
vercel-token: ${{ secrets.VERCEL_STORYBOOK_TOKEN }}
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ on:
push:
branches:
- main
- v2
- v1-hotfix
- v1

pull_request:
branches:
- main
- v2
- v1-hotfix
- v1

env:
PNPM_CACHE_FOLDER: .pnpm-store
Expand Down

0 comments on commit c495556

Please sign in to comment.