Skip to content

Commit

Permalink
Merge pull request #5 from jordanjones98/revert-4-update-release-actions
Browse files Browse the repository at this point in the history
Revert "ci(actions): change master branch to main branch"
  • Loading branch information
jordanjones98 authored Mar 29, 2024
2 parents 1811e8b + a869dcb commit c357422
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Overseerr Release
on:
push:
branches:
- main
- master

jobs:
semantic-release:
Expand Down Expand Up @@ -59,15 +59,15 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Switch to main branch
run: git checkout main
- name: Switch to master branch
run: git checkout master
- name: Pull latest changes
run: git pull
- name: Prepare
id: prepare
run: |
git fetch --prune --tags
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/main ]]; then
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
echo "RELEASE=stable" >> $GITHUB_OUTPUT
else
echo "RELEASE=edge" >> $GITHUB_OUTPUT
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/snap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Publish Snap
on:
push:
branches:
- na
# - develop
- develop

jobs:
jobs:
Expand Down Expand Up @@ -35,7 +34,7 @@ jobs:
id: prepare
run: |
git fetch --prune --unshallow --tags
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/main ]]; then
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
echo "RELEASE=stable" >> $GITHUB_OUTPUT
else
echo "RELEASE=edge" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to
- Your code **must** be formatted correctly, or the tests will fail.
- We use Prettier to format our code base. It should automatically run with a Git hook, but it is recommended to have the Prettier extension installed in your editor and format on save.
- If you have questions or need help, you can reach out via [Discussions](https://github.com/sct/overseerr/discussions) or our [Discord server](https://discord.gg/overseerr).
- Only open pull requests to `develop`, never `main`! Any pull requests opened to `main` will be closed.
- Only open pull requests to `develop`, never `master`! Any pull requests opened to `master` will be closed.

### UI Text Style

Expand Down
33 changes: 26 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,18 @@
}
},
"lint-staged": {
"**/*.{ts,tsx,js}": ["prettier --write", "eslint"],
"**/*.{json,md,css}": ["prettier --write"]
"**/*.{ts,tsx,js}": [
"prettier --write",
"eslint"
],
"**/*.{json,md,css}": [
"prettier --write"
]
},
"commitlint": {
"extends": ["@commitlint/config-conventional"]
"extends": [
"@commitlint/config-conventional"
]
},
"release": {
"plugins": [
Expand All @@ -197,7 +204,10 @@
[
"@semantic-release/git",
{
"assets": ["package.json", "CHANGELOG.md"],
"assets": [
"package.json",
"CHANGELOG.md"
],
"message": "chore(release): ${nextRelease.version}"
}
],
Expand All @@ -209,16 +219,25 @@
}
]
],
"branches": ["main"],
"branches": [
"master"
],
"npmPublish": false,
"publish": [
{
"path": "semantic-release-docker-buildx",
"buildArgs": {
"COMMIT_TAG": "$GIT_SHA"
},
"imageNames": ["sctx/overseerr", "ghcr.io/sct/overseerr"],
"platforms": ["linux/amd64", "linux/arm64", "linux/arm/v7"]
"imageNames": [
"sctx/overseerr",
"ghcr.io/sct/overseerr"
],
"platforms": [
"linux/amd64",
"linux/arm64",
"linux/arm/v7"
]
},
"@semantic-release/github"
]
Expand Down

0 comments on commit c357422

Please sign in to comment.