Skip to content

Commit

Permalink
[github-actions][releases] adapt our github-actions+scripts with the…
Browse files Browse the repository at this point in the history
… fact that main branch will replace master branch
  • Loading branch information
EvanBldy committed Nov 12, 2024
1 parent c64f397 commit 52e7b5f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 17 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
---
name: 'Kitsu CI'

on:
pull_request:
branches:
- master
push:
branches:
- master
on: [push, pull_request]

jobs:
ci:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: 'Kitsu release'
on:
push:
branches:
- master
- main
tags:
- '*'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy Kitsu to staging environment
on:
push:
branches:
- master
- main

jobs:
build:
Expand All @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Update Kitsu on staging server
uses: appleboy/ssh-action@v1.0.3
uses: appleboy/ssh-action@v1.1.0
env:
HUSKY: 0
NODE_OPTIONS: '--max_old_space_size=8192'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For further information about features and installation, please refer to the
## Contributing

There are many ways to contribute to Kitsu, from simple tasks to most complex ones. We created a
[contributing guide](https://github.com/cgwire/kitsu/blob/master/CONTRIBUTING.md) explaining everything.
[contributing guide](https://github.com/cgwire/kitsu/blob/main/CONTRIBUTING.md) explaining everything.
You will find all the information you are looking for!

## Sponsors
Expand Down
8 changes: 4 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
We release Kitsu versions through GitHub.
Every time a new version is ready, we follow this process:

1. Rebase sources on the `master` branch.
1. Rebase sources on the `main` branch.
2. Up the version number through the `npm` CLI.
3. Tag the commit with the Kitsu version.
4. Push changes to the `master` branch.
4. Push changes to the `main` branch.

You can run the following script to perform these commands at once:

```bash
git pull --rebase origin master
git pull --rebase origin main
npm version patch
git push origin master --tag
git push origin main --tag
```

# Deployment
Expand Down
4 changes: 2 additions & 2 deletions scripts/release.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set -e
git pull --rebase origin master
git pull --rebase origin main
npm version patch
git push origin master --tag
git push origin main --tag

0 comments on commit 52e7b5f

Please sign in to comment.