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

WASM mostly working... #142

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
23 changes: 9 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,12 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup
uses: ./.github/workflows/setup
- name: Backend tests
uses: actions-rs/cargo@v1
with:
command: insta
args: test --features=no-docker
- name: Build Aquascope server
run: cargo build -p aquascope_serve --features=no-docker
- name: Frontend tests
run: |
cargo run -p aquascope_serve --features=no-docker &
cd frontend && depot test
- uses: actions/checkout@v3

- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- uses: DeterminateSystems/flake-checker-action@main

- name: Argus Test
#run: nix develop --command ci-check
run: echo "TODO tests disabled"
119 changes: 0 additions & 119 deletions .github/workflows/pre-release.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/quick-setup/action.yml

This file was deleted.

86 changes: 67 additions & 19 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,81 @@ on:
types: [labeled,closed]

jobs:

tag:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release')
steps:
- uses: actions/checkout@v3
- uses: christophebedard/tag-version-commit@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
version_regex: 'v([0-9]+\.[0-9]+\.[0-9]+)'
version_tag_prefix: 'v'
- name: Tag
run: echo "TODO explicitly not tagging"
# - uses: christophebedard/tag-version-commit@v1
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# version_regex: 'v([0-9]+\.[0-9]+\.[0-9]+)'
# version_tag_prefix: 'v'

release-artifact:

publish-crates:
needs: tag
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release')
steps:
- name: Publish
run: echo "TODO explicitly not publishing"
# - uses: actions/checkout@v3
# - uses: DeterminateSystems/nix-installer-action@main
# - uses: DeterminateSystems/magic-nix-cache-action@main
# - uses: DeterminateSystems/flake-checker-action@main

# - name: Install aquascope and mdbook-aquascope
# run: nix develop --command ci-install

# - name: Publish Crates
# run: nix develop --command ci-publish-crates ${{ secrets.CRATES_IO_TOKEN }}


update-frontend:
needs: publish-crates
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Quick Setup
uses: ./.github/workflows/quick-setup
- name: Build artifact
run: cargo build --release -p mdbook-aquascope -p aquascope_front
- name: Package artifact
run: tar -czf aquascope-x86_64-unknown-linux-gnu.tar.gz mdbook-aquascope cargo-aquascope aquascope-driver
working-directory: target/release
- name: Release artifact
uses: softprops/action-gh-release@v1
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- uses: DeterminateSystems/flake-checker-action@main

- name: Build Docs and Standalone
run: nix develop .#minimal --command ci-build-pages

- uses: JamesIves/[email protected]
with:
tag_name: ${{ github.event.pull_request.title }}
files: |
target/release/aquascope-x86_64-unknown-linux-gnu.tar.gz
branch: gh-pages
folder: ./frontend/packages/aquascope-standalone/dist
clean: true
clean-exclude: dev


release-artifact:
needs: publish-crates
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release')
steps:
- name: Release Artifact
run: echo "TODO explicitly not releasing an artifact"
# - uses: actions/checkout@v3
# - uses: DeterminateSystems/nix-installer-action@main
# - uses: DeterminateSystems/magic-nix-cache-action@main
# - uses: DeterminateSystems/flake-checker-action@main

# - name: Install aquascope and mdbook-aquascope
# run: nix develop --command ci-build

# - name: Package artifact
# run: tar -czf aquascope-x86_64-unknown-linux-gnu.tar.gz mdbook-aquascope cargo-aquascope aquascope-driver
# working-directory: target/release

# - name: Release artifact
# uses: softprops/action-gh-release@v1
# with:
# tag_name: ${{ github.event.pull_request.title }}
# files: |
# target/release/aquascope-x86_64-unknown-linux-gnu.tar.gz
43 changes: 0 additions & 43 deletions .github/workflows/run-on-remote/action.yml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/setup/action.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
tmp/
dist/
node_modules/
.direnv/
.envrc
bindings/

# Ignore generated credentials from google-github-actions/auth
gha-creds-*.json
Expand All @@ -20,3 +23,4 @@ sample-book/
# Rust things
target/
debug/
examples/
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "frontend/packages/rustc/src/assets/wasm-builds"]
path = frontend/packages/rustc/src/assets/wasm-builds
url = [email protected]:cognitive-engineering-lab/wasm-builds.git
[submodule "frontend/packages/system/src/assets/wasm-builds"]
path = frontend/packages/system/src/assets/wasm-builds
url = [email protected]:cognitive-engineering-lab/wasm-builds.git
7 changes: 0 additions & 7 deletions Caddyfile

This file was deleted.

Loading