Skip to content

Commit

Permalink
Merge branch 'master' into server-links
Browse files Browse the repository at this point in the history
  • Loading branch information
Commandcracker authored Nov 26, 2024
2 parents 8007a9f + ffa8234 commit 4d23587
Show file tree
Hide file tree
Showing 64 changed files with 28,042 additions and 18,880 deletions.
5 changes: 4 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
<!-- Please use Markdown Checkboxes.
[ ] = not done
[x] = done
(or just click checkboxes to toggle them)
-->
## Checklist
Things need to be done before this Pull Request can be merged.

- [ ] Code is well-formatted and adheres to project style guidelines: `cargo fmt`
- [ ] Code does not produce any clippy warnings `cargo clippy`
- [ ] Code does not produce any clippy warnings: `cargo clippy`
- [ ] All unit tests pass: `cargo test`
- [ ] I added new unit tests, so other people don't accidentally break my code by changing other parts of the codebase. [How?](https://doc.rust-lang.org/book/ch11-01-writing-tests.html)
47 changes: 47 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: deploy-docker-image

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

on:
push:
branches:
- "master"

jobs:
docker-build-deploy:
runs-on: ubuntu-latest

permissions:
contents: read
packages: write
attestations: write
id-token: write

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Login to GitHub CR
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build and Push
uses: docker/build-push-action@v6
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,4 @@ docs/.vitepress/cache
node_modules

run/

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ thiserror = "2"
num-traits = "0.2"
num-derive = "0.4"

bytes = "1.8"

# Concurrency/Parallelism and Synchronization
rayon = "1.10.0"
parking_lot = { version = "0.12.3", features = ["send_guard"] }
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ and customizable experience. It prioritizes performance and player enjoyment whi
- [x] Server Brand
- [x] Server Links
- [x] Set Resource Pack
- [ ] Cookies
- [x] Cookies
- World
- [x] World Joining
- [x] Player Tab-list
Expand Down
Loading

0 comments on commit 4d23587

Please sign in to comment.