diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index bbe4d83..4104dc2 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -6,7 +6,6 @@ on: - "**.md" branches: - 'main' - - 'master' jobs: build-docker: diff --git a/.github/workflows/main-rust.yml b/.github/workflows/main-rust.yml index 54f8a30..6d21462 100644 --- a/.github/workflows/main-rust.yml +++ b/.github/workflows/main-rust.yml @@ -7,7 +7,6 @@ on: branches: - 'main' - - 'master' release: types: [published] @@ -62,7 +61,7 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 - if: github.base_ref != 'master' && github.event_name == 'release' + if: github.base_ref != 'main' && github.event_name == 'release' with: tag_name: ${{ steps.version.outputs.VERSION }} name: ${{ steps.version.outputs.VERSION }} - ${{ github.event.head_commit.message }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a75baf7..c8e8d2a 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -8,12 +8,10 @@ on: push: branches: - 'main' - - 'master' pull_request: branches: - 'main' - - 'master' jobs: test: diff --git a/.replit b/.replit index fb83ea7..e973713 100644 --- a/.replit +++ b/.replit @@ -1,2 +1,2 @@ -run = "while :; do set -ex; nix-env -iA nixpkgs.unzip; curl -o./redlib.zip -fsSL -- https://nightly.link/redlib-org/redlib/workflows/main-rust/master/redlib.zip; unzip -n redlib.zip; mv target/x86_64-unknown-linux-gnu/release/redlib .; chmod +x redlib; set +e; ./redlib -H 63115200; sleep 1; done" +run = "while :; do set -ex; nix-env -iA nixpkgs.unzip; curl -o./redlib.zip -fsSL -- https://nightly.link/redlib-org/redlib/workflows/main-rust/main/redlib.zip; unzip -n redlib.zip; mv target/x86_64-unknown-linux-gnu/release/redlib .; chmod +x redlib; set +e; ./redlib -H 63115200; sleep 1; done" language = "bash" diff --git a/README.md b/README.md index 483b6f1..7111ba7 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,9 @@ I appreciate any donations! Your support allows me to continue developing Redlib 🔗 **Want to automatically redirect Reddit links to Redlib? Use [LibRedirect](https://github.com/libredirect/libredirect) or [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect)!** -[Follow this link](https://github.com/libreddit/libreddit-instances/blob/master/instances.md) for an up-to-date table of instances in Markdown format. This list is also available as [a machine-readable JSON](https://github.com/libreddit/libreddit-instances/blob/master/instances.json). +[Follow this link](https://github.com/redlib-org/redlib-instances/blob/main/instances.md) for an up-to-date table of instances in Markdown format. This list is also available as [a machine-readable JSON](https://github.com/redlib-org/redlib-instances/blob/main/instances.json). -Both files are part of the [libreddit-instances](https://github.com/libreddit/libreddit-instances) repository. To contribute your [self-hosted instance](#deployment) to the list, see the [libreddit-instances README](https://github.com/libreddit/libreddit-instances/blob/master/README.md). +Both files are part of the [libreddit-instances](https://github.com/redlib-org/redlib-instances) repository. To contribute your [self-hosted instance](#deployment) to the list, see the [libreddit-instances README](https://github.com/redlib-org/redlib-instances/blob/main/README.md). --- diff --git a/scripts/gen-credits.sh b/scripts/gen-credits.sh index 24534a4..825ac0f 100755 --- a/scripts/gen-credits.sh +++ b/scripts/gen-credits.sh @@ -9,7 +9,7 @@ set -o pipefail cd "$(dirname "${BASH_SOURCE[0]}")/../" || exit 1 -git --no-pager log --pretty='%an <%ae>%n%cn <%ce>' master \ +git --no-pager log --pretty='%an <%ae>%n%cn <%ce>' main \ | sort -t'<' -u -k1,1 -k2,2 \ | grep -Fv -- 'GitHub ' \ > CREDITS