Skip to content

Commit

Permalink
build: Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
remko committed Feb 23, 2024
1 parent a07f283 commit 0fb992e
Show file tree
Hide file tree
Showing 14 changed files with 3,070 additions and 2,031 deletions.
6 changes: 0 additions & 6 deletions .eslintignore

This file was deleted.

29 changes: 0 additions & 29 deletions .eslintrc.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ runs:
- uses: actions/setup-node@v2
with:
node-version: 17
cache: 'yarn'
registry-url: 'https://registry.npmjs.org/'
cache: 'npm'
# - if: runner.os == 'macOS'
# run: brew install wabt
# shell: bash
Expand All @@ -31,5 +32,5 @@ runs:
mv /tmp/wabt-1.0.31 /c/tools/wabt
cp /c/tools/wabt/bin/* /c/Windows/system32
shell: bash
- run: yarnpkg --pure-lockfile
- run: npm ci
shell: bash
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup
- run: yarnpkg build
- run: yarnpkg lint
- run: yarnpkg test --coverage
- run: npm run build
- run: npm run lint
- run: npm test
- run: make -C src/web/notebook
- run: ./dist/wafnb2html src/web/notebook/examples/drawing-with-forth.wafnb

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup
- run: yarnpkg publish --non-interactive
- run: npm publish
env:
NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ WAT2WASM_FLAGS:=$(WAT2WASM_FLAGS) --debug-names
endif

all:
yarn -s build
npm run build

dev:
yarn -s dev
npm run dev

check:
yarn -s test
npm test

check-watch:
yarn -s test-watch
npm run test-watch

lint:
yarn -s lint
npm run lint

wasm: src/waforth.assembled.wat scripts/word.wasm.hex

Expand Down
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,28 +264,27 @@ Here are some of the goals (and non-goals) of WAForth:

The build uses the [WebAssembly Binary
Toolkit](https://github.com/WebAssembly/wabt) for converting raw WebAssembly
text format into the binary format, and [Yarn](https://yarnpkg.com) (and therefore
[Node.JS](https://nodejs.org/en/)) for
text format into the binary format, and [Node.JS](https://nodejs.org/en/) for
managing the build process and the dependencies of the shell.

brew install wabt yarn
yarn
brew install wabt node
npm install


### Building & Running

To build everything:

yarn build
npm run build

To run the development server:

yarn dev
npm run dev

### Testing

The tests are served from `/waforth/tests` by the development server.

You can also run the tests in Node.JS by running

yarn test
npm test
Loading

0 comments on commit 0fb992e

Please sign in to comment.