Skip to content

Commit

Permalink
Merge branch 'main' into u-train/implement-locked
Browse files Browse the repository at this point in the history
  • Loading branch information
Dekkonot committed Oct 31, 2024
2 parents 5e735c6 + 5317c25 commit cfbd512
Show file tree
Hide file tree
Showing 9 changed files with 170 additions and 47 deletions.
21 changes: 19 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
# Contribution guide for wally

More info will be added here in the future. For now, if you want changes then please add an issue or create a PR! All issues, PRs, and comments on PRs are incredibly helpful. It may take us a while to get to your PR but if you feel it is important then please head to the #wally channel in the Roblox OSS discord server (find this in the top right of [wally.run](https://wally.run/)) and give us a ping!
Please respect that wally is still in early stages of development. Things are messy. Time is precious. We may be slow.

- **Only start making a PR if you are confident with Rust or TS/React** (issues and comments are always appreciated though)
- **Documentation for developing exists but may be outdated**
- **Be prepared to figure out how to get things going**
- **Fixing up any issues you do have getting going is a fantastic way to start helping!**
- **Polish and refine PRs as much as possible and ensure they pass CI checks before requesting a review**
- **If you want advise on a draft then discuss it in [#wally] first.**

Beyond that we are pretty chill, I promise! If you make good changes I will do my best to help you get them to the finish line.

More info will be added here in the future. For now, if you want changes then please add an issue or create a PR! All issues, PRs, and comments on PRs are incredibly helpful. It may take us a while to get to your PR but if you feel it is important then please head to the [#wally] channel in the Roblox OSS discord server (find this in the top right of [wally.run](https://wally.run/)) and let us know!

The current lead maintainer for wally is @magnalite, that's me! If you want to work on a complex change or feel like your pr/issue has gone unnoticed for too long then give me a ping in [#wally]!

Finally, as you may have guessed by now... If in doubt head to [#wally] and ask. Anyone is welcome to come in and ask anything about wally.

[#wally]: https://discord.com/channels/385151591524597761/872225914149302333

## Creating a new wally release

Expand All @@ -20,4 +37,4 @@ More info will be added here in the future. For now, if you want changes then pl
7. Push `git push && git push --tags`
8. Update release information

(Thank you to lpg / rojo for inspiration for this release checklist)
(Thank you to lpg / rojo for inspiration for this release checklist)
79 changes: 53 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ ubyte = "0.10.3"
indicatif = "0.17.4"
tokio = "1.28.2"
serial_test = "2.0.0"
time = "=0.3.35"

[dev-dependencies]
insta = { version = "1.1.0" }
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<div align="center" width="800">
<img alt="Wally Logo" src="wally-logo.svg" />
<h1>Wally, a package manager for Roblox</h1>
<h1>Wally, a package manager for Roblox
<br><a href="https://upliftgames-wally.statuspage.io/"><img alt="Dynamic Status Badge" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fvhs2807lh6ws.statuspage.io%2Fapi%2Fv2%2Fsummary.json&query=%24.status.description&label=Status%20"></a>
</h1>
</div>


* [Installation](#installation)
* [Commands](#commands)
* [Prior Art](#prior-art)
Expand Down Expand Up @@ -50,7 +53,7 @@ Pre-built binaries are available for Windows, macOS, and Linux from the [GitHub
[releases]: https://github.com/UpliftGames/wally/releases

### From Source
It's straightforward to compile Wally from source. Wally requires Rust 1.51.0 or newer.
It's straightforward to compile Wally from source. Wally requires Rust 1.80.0 or newer.

Clone the repository and use:

Expand Down
1 change: 1 addition & 0 deletions wally-registry-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ url = { version = "2.2.1", features = ["serde"] }
walkdir = "2.3.1"
zip = "0.5.11"
moka = "0.11.1"
time = "=0.3.35"

[dev-dependencies]
tempfile = "3.1.0"
Expand Down
4 changes: 2 additions & 2 deletions wally-registry-backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1-slim-buster AS build
FROM rust:1.81-slim-bookworm AS build
WORKDIR /usr/app

# Debian Slim doesn't install certificates by default, but we kinda want those.
Expand All @@ -24,7 +24,7 @@ COPY ./wally-registry-backend ./wally-registry-backend/
RUN touch wally-registry-backend/src/main.rs
RUN cargo build --package wally-registry-backend --release

FROM debian:buster-slim
FROM debian:bookworm-slim

# Install the same SSL packages as in our build image.
RUN apt-get update
Expand Down
2 changes: 1 addition & 1 deletion wally-registry-backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This directory contains the backend to the Wally registry. It's the interface that clients use for downloading, publishing, and yanking packages.

## Requirements
- Rust 1.50.0+
- Rust 1.80.0+
- C toolchain for OpenSSL

## Running
Expand Down
Loading

0 comments on commit cfbd512

Please sign in to comment.