Revert "ci(actions): change master branch to main branch"

pull/3829/head
Jordan Jones 2 months ago committed by GitHub
parent 1811e8b4af
commit a869dcb713
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -3,7 +3,7 @@ name: Overseerr Release
on: on:
push: push:
branches: branches:
- main - master
jobs: jobs:
semantic-release: semantic-release:
@ -59,15 +59,15 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Switch to main branch - name: Switch to master branch
run: git checkout main run: git checkout master
- name: Pull latest changes - name: Pull latest changes
run: git pull run: git pull
- name: Prepare - name: Prepare
id: prepare id: prepare
run: | run: |
git fetch --prune --tags 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 echo "RELEASE=stable" >> $GITHUB_OUTPUT
else else
echo "RELEASE=edge" >> $GITHUB_OUTPUT echo "RELEASE=edge" >> $GITHUB_OUTPUT

@ -3,8 +3,7 @@ name: Publish Snap
on: on:
push: push:
branches: branches:
- na - develop
# - develop
jobs: jobs:
jobs: jobs:
@ -35,7 +34,7 @@ jobs:
id: prepare id: prepare
run: | run: |
git fetch --prune --unshallow --tags 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 echo "RELEASE=stable" >> $GITHUB_OUTPUT
else else
echo "RELEASE=edge" >> $GITHUB_OUTPUT echo "RELEASE=edge" >> $GITHUB_OUTPUT

@ -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. - 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. - 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). - 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 ### UI Text Style

@ -177,11 +177,18 @@
} }
}, },
"lint-staged": { "lint-staged": {
"**/*.{ts,tsx,js}": ["prettier --write", "eslint"], "**/*.{ts,tsx,js}": [
"**/*.{json,md,css}": ["prettier --write"] "prettier --write",
"eslint"
],
"**/*.{json,md,css}": [
"prettier --write"
]
}, },
"commitlint": { "commitlint": {
"extends": ["@commitlint/config-conventional"] "extends": [
"@commitlint/config-conventional"
]
}, },
"release": { "release": {
"plugins": [ "plugins": [
@ -197,7 +204,10 @@
[ [
"@semantic-release/git", "@semantic-release/git",
{ {
"assets": ["package.json", "CHANGELOG.md"], "assets": [
"package.json",
"CHANGELOG.md"
],
"message": "chore(release): ${nextRelease.version}" "message": "chore(release): ${nextRelease.version}"
} }
], ],
@ -209,7 +219,9 @@
} }
] ]
], ],
"branches": ["main"], "branches": [
"master"
],
"npmPublish": false, "npmPublish": false,
"publish": [ "publish": [
{ {
@ -217,8 +229,15 @@
"buildArgs": { "buildArgs": {
"COMMIT_TAG": "$GIT_SHA" "COMMIT_TAG": "$GIT_SHA"
}, },
"imageNames": ["sctx/overseerr", "ghcr.io/sct/overseerr"], "imageNames": [
"platforms": ["linux/amd64", "linux/arm64", "linux/arm/v7"] "sctx/overseerr",
"ghcr.io/sct/overseerr"
],
"platforms": [
"linux/amd64",
"linux/arm64",
"linux/arm/v7"
]
}, },
"@semantic-release/github" "@semantic-release/github"
] ]

Loading…
Cancel
Save