diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b6143e2..203232dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Overseerr Release on: push: branches: - - main + - master jobs: semantic-release: @@ -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 diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index e14e374f..16489a89 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -3,8 +3,7 @@ name: Publish Snap on: push: branches: - - na - # - develop + - develop jobs: jobs: @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cf1be03f..51df9e14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/package.json b/package.json index 17e7f3c7..8b82e45d 100644 --- a/package.json +++ b/package.json @@ -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": [ @@ -197,7 +204,10 @@ [ "@semantic-release/git", { - "assets": ["package.json", "CHANGELOG.md"], + "assets": [ + "package.json", + "CHANGELOG.md" + ], "message": "chore(release): ${nextRelease.version}" } ], @@ -209,7 +219,9 @@ } ] ], - "branches": ["main"], + "branches": [ + "master" + ], "npmPublish": false, "publish": [ { @@ -217,8 +229,15 @@ "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" ]