Skip to content

Commit

Permalink
Fix workflow, add web port to documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
carstene1ns committed Sep 19, 2024
1 parent 58cf238 commit eefcc91
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ jobs:
web-emscripten:
name: Build (Emscripten)
needs: prepare
runs-on: emscripten/emsdk
runs-on: ubuntu-latest
container: emscripten/emsdk
steps:
- name: Install dependencies
run: |
Expand All @@ -174,17 +175,19 @@ jobs:

- name: Build OpenJazz
run: |
emcmake cmake --workflow --preset release -DDATAPATH=/data -DNETWORK=OFF
touch build-release/data.js # dummy data
ls -l build-release
emcmake cmake -B build-web . -G Ninja -DCMAKE_BUILD_TYPE=Release \
-DDATAPATH=/data -DNETWORK=OFF
cmake --build build-web
touch build-web/data.{js,data} # dummy data
ls -l build-web/OpenJazz*
- name: Prepare artifact
env:
OJ_VERSION: ${{ needs.prepare.outputs.oj_version }}
run: |
mkdir OJ-${OJ_VERSION}
builds/ci/adoc2txt ${OJ_VERSION} < res/unix/OpenJazz.6.adoc > OJ-${OJ_VERSION}/Manual.txt
cp build-release/*.{wasm,js,html,data} README.md COPYING licenses.txt OJ-${OJ_VERSION}/
cp build-web/*.{wasm,js,html,data} README.md COPYING licenses.txt OJ-${OJ_VERSION}/
- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -327,6 +330,7 @@ jobs:
- dist
- linux-clang
- windows-mingw-gcc
- web-emscripten
- nintendo-devkitpro
- riscos-gccsdk
- psp-pspdev
Expand Down Expand Up @@ -392,6 +396,7 @@ jobs:
- dist
- linux-clang
- windows-mingw-gcc
- web-emscripten
- nintendo-devkitpro
- riscos-gccsdk
- psp-pspdev
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
OpenJazz can be compiled on a wide range of operating systems, including
Windows, macOS, GNU/Linux and BSD flavors. Also ports are available for some
homebrew platforms, consoles and handhelds. See [Platforms](PLATFORMS.md) for
details.
details. You can even play it [inside your web browser][web port].

To play, you will need the files from one of the original games.

Expand Down Expand Up @@ -53,7 +53,7 @@ software.

## [Building](BUILDING.md)

## Running
## Running [![Play in Browser][web badge]][web port]

Execute `OpenJazz`. Depending on the platform and compile time options, the
data files are expected to be under different paths (alongside the executable
Expand All @@ -71,3 +71,5 @@ Original author: Alister Thomson (alister_j_t at yahoo dot com)
http://alister.eu/jazz/oj/

[logo]: res/unix/OpenJazz.png
[web badge]: https://img.shields.io/badge/Play_in-Browser-blue?style=plastic
[web port]: https://openjazz.github.io
1 change: 1 addition & 0 deletions res/unix/OpenJazz.6.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,4 @@ Ricerind:: Mac OS X port
Slaanesh:: GP32 port
GPF:: Dreamcast port
Cameron Cawley (ccawley2011):: RISC OS, SDL2 port
midzer:: Web port

0 comments on commit eefcc91

Please sign in to comment.