Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make whiskers run on fermyon cloud #74

Closed
wants to merge 1 commit into from
Closed
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
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ on:
jobs:
build:
runs-on: "ubuntu-latest"
services:
redis:
image: redis:7
ports:
- 6379:6379

steps:
- uses: actions/checkout@v2

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.spin/
tally/target/*
scoreboard/target/*
highscore/target/*
Expand Down
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ build:
serve:
./serve.sh

.PHONY: start-redis
start-redis:
@docker start fw-redis &>/dev/null || docker run -p 6379:6379 --name fw-redis redis:7 &

.PHONY: stop-redis
stop-redis:
@docker stop fw-redis &>/dev/null

.PHONY: test-server
test-server:
./tests/test-server.sh
./tests/test-server.sh
16 changes: 0 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Finicky Whiskers is comprised of a handful of microservices. Click on each item
below to see more details around a particular microservice.

- [morsel_event](./morsel_event/README.md)
- [redirect](./redirect/README.md)
- [scoreboard](./scoreboard/README.md)
- [session](./session/README.md)
Expand Down Expand Up @@ -37,15 +36,6 @@ make build-session

## To Run

Finicky Whiskers depends on a Redis instance to run. The default connection
string is `redis://localhost:6379`.

If you have Docker installed, you can start a redis container like so:

```console
make start-redis
```

The following command will serve the Finicky Whiskers site locally:

```console
Expand All @@ -54,12 +44,6 @@ make serve

This will run the game at [http://127.0.0.1:3000](http://127.0.0.1:3000)

When finished, the following command will stop the redis container:

```console
make stop-redis
```

## To Test

The following command will serve the site and then run the integration test
Expand Down
Binary file modified components/highscore.wasm
Binary file not shown.
Binary file removed components/morsel_event.wasm
Binary file not shown.
Binary file modified components/redirect.wasm
Binary file not shown.
Binary file added components/reset.wasm
Binary file not shown.
Binary file modified components/scoreboard.wasm
Binary file not shown.
Binary file modified components/tally.wasm
Binary file not shown.
146 changes: 70 additions & 76 deletions highscore/Cargo.lock

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

8 changes: 4 additions & 4 deletions highscore/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = "0.1.0"
edition = "2021"

[lib]
crate-type = [ "cdylib" ]
crate-type = ["cdylib"]

[dependencies]
# Useful crate to handle errors.
Expand All @@ -16,13 +16,13 @@ bytes = "1"
# General-purpose crate with common HTTP types.
http = "0.2"
# The Spin SDK.
spin-sdk = { git = "https://github.com/fermyon/spin", tag = "v0.6.0" }
spin-sdk = { git = "https://github.com/fermyon/spin", tag = "v1.2.0" }
# Crate that generates Rust Wasm bindings from a WebAssembly interface.
wit-bindgen-rust = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "e9c7c0a3405845cecd3fe06f3c20ab413302fc73" }
wit-bindgen-rust = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "cb871cfa1ee460b51eb1d144b175b9aab9c50aba" }
# ULID support
rusty_ulid = "1.0.0"
# Serde
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

[workspace]
[workspace]
Loading