Skip to content

Commit ca4408c

Browse files
committed
bump version 3, drop warp, tls, acme and cache, swap to salvo
1 parent 90a7098 commit ca4408c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+3482
-6239
lines changed

.github/workflows/spa-server-ci.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- 'client/**'
2828
- 'server/**'
2929
- 'Cargo.lock'
30-
check_js_sdk:
30+
check_js_client:
3131
- 'jsclient/**'
3232
3333
check_server:
@@ -39,14 +39,10 @@ jobs:
3939
with:
4040
submodules: true
4141
- uses: Swatinem/rust-cache@v2
42-
- name: run integration test
43-
# --show-output
42+
- name: run integration test 1
4443
run: cargo test -p tests --test http_test -j 1 -- --test-threads 1
45-
- name: run pebble
46-
run: ./run_pebble.sh
47-
working-directory: ./tests/bash/
48-
- name: run acme integration test
49-
run: cargo test -p tests --test acme_test -j 1 -- --test-threads 1
44+
- name: run integration test 2
45+
run: cargo test -p tests --test admin_server_test -j 1 -- --test-threads 1
5046
- name: run spa-client test
5147
run: cargo test -p spa-client -j 1 -- --test-threads 1
5248
- name: run spa-server test
@@ -57,10 +53,16 @@ jobs:
5753
runs-on: ubuntu-latest
5854
steps:
5955
- uses: actions/checkout@v4
60-
# Setup .npmrc file to publish to npm
56+
- name: Run spa-server docker
57+
run: |
58+
docker run -d --name=test -p 9000:9000 -p 8080:8080 -v ${{ github.workspace }}/jsclient/test/config.toml:/config/config.toml ghcr.io/fornetcode/spa-server:v2.4.0
59+
docker ps
60+
docker logs --tail 50 test
6161
- uses: actions/setup-node@v4
6262
with:
6363
node-version: '20.x'
6464
cache: 'npm'
6565
cache-dependency-path: './jsclient/package-lock.json'
66-
- run: npm ci && npm run build
66+
- run: |
67+
cd ./example/js-app-example && npm ci && npm run build && \
68+
cd ../../jsclient && npm ci && npm test && npm run build

0 commit comments

Comments
 (0)