Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Publish docs via GitHub Pages
on:
push:
branches:
- master
- main
- release/**

jobs:
build:
name: Deploy docs
runs-on: ubuntu-latest
steps:
- name: Checkout master
- name: Checkout main
uses: actions/checkout@v2
with:
fetch-depth: 0
Expand All @@ -31,13 +31,13 @@ jobs:
git config --global user.email "${GITHUB_ACTOR}@users.noreply.${GITHUB_DOMAIN:-github.com}"

- name: Deploy dev docs
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
run: mike deploy --push --update-aliases DEV
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Deploy release docs
if: github.ref != 'refs/heads/master'
if: github.ref != 'refs/heads/main'
run: mike deploy --push --update-aliases ${GITHUB_REF##*/} RELEASE
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions docs/contribute/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ official code repo) with your fork.

```shell
cd path/to/nodecg-io
git checkout master
git pull https://github.com/codeoverflow-org/nodecg-io master
git checkout main
git pull https://github.com/codeoverflow-org/nodecg-io main
```

Manage any merge conflicts, commit them, and then push them to your fork.

You may also occasionally need to merge upstream master in a pull request. To do
that make the above to update your local master, and then merge your local
master into your PR branch.
You may also occasionally need to merge upstream main in a pull request. To do
that make the above to update your local main branch, and then merge your local
main branch into your PR branch.

### Where to Contribute

Expand Down
2 changes: 1 addition & 1 deletion docs/contribute/create_service.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ The file should look like this:
## Using the <the services name> sample bundle

No sample bundle for service `<the services name>`.
[You can help us and create one!](https://github.com/codeoverflow-org/nodecg-io/blob/master/docs/docs/contribute.md)
[You can help us and create one!](https://github.com/codeoverflow-org/nodecg-io-docs/blob/main/docs/contribute/docs_sample.md)
```

!!! ATTENTION
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- Do not set the 'Services implemented' value manually. It's inserted automatically. -->

[![Services](https://img.shields.io/static/v1?label=Services%20implemented&message=42&color=blue&style=flat-square)](services.md)
[![License](https://img.shields.io/github/license/codeoverflow-org/nodecg-io?label=License&style=flat-square)](https://github.com/codeoverflow-org/nodecg-io/blob/master/LICENSE)
[![License](https://img.shields.io/github/license/codeoverflow-org/nodecg-io?label=License&style=flat-square)](https://github.com/codeoverflow-org/nodecg-io/blob/main/LICENSE)
[![Discord](https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&style=flat-square)](https://discord.gg/sX2Gjbs/)

**nodecg-io is a [NodeCG](https://github.com/nodecg/nodecg)-bundle that implements Social Media API's in the NodeCG framework**
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ site_dir: build

repo_name: codeoverflow-org/nodecg-io
repo_url: https://github.com/codeoverflow-org/nodecg-io
edit_uri: https://github.com/codeoverflow-org/nodecg-io-docs/edit/master/docs/
edit_uri: https://github.com/codeoverflow-org/nodecg-io-docs/edit/main/docs/

markdown_extensions:
- plantuml_markdown:
Expand Down