Skip to content

Commit

Permalink
Merge branch 'dev' into wc-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@borngraced
borngraced committed Feb 6, 2025
2 parents e39507b + 1416071 commit 5fdc5a2
Show file tree
Hide file tree
Showing 45 changed files with 1,087 additions and 1,318 deletions.
1 change: 0 additions & 1 deletion .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ cmake-build-debug
/wasm-build.log

# Opt out from history in order to speed the `COPY .` up.
# Note that we should create and/or update the MM_VERSION file when using `COPY .` to build a custom version.
/.git
164 changes: 67 additions & 97 deletions .github/workflows/dev-build.yml
View file

Large diffs are not rendered by default.

150 changes: 60 additions & 90 deletions .github/workflows/release-build.yml
View file

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ scripts/mm2/seed/unparsed.txt
/js/.kdf.*

# Rust artefacts
/MM_DATETIME
/MM_DATETIME.tmp
/MM_VERSION
/MM_VERSION.tmp
/target
/targettest
/clippytarget
Expand Down
Loading

0 comments on commit 5fdc5a2

Please sign in to comment.