Browse Source

Merge branch 'main' into transport-status

pull/790/head
philon- 11 months ago
parent
commit
14fa16eb88
  1. 15
      .github/workflows/nightly.yml
  2. 2
      .github/workflows/pr.yml
  3. 17
      .github/workflows/release-packages.yml
  4. 19
      .github/workflows/release-web.yml
  5. 2
      packages/transport-web-serial/package.json
  6. 2
      packages/web/package.json

15
.github/workflows/nightly.yml

@ -17,10 +17,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
# Node + pnpm (with built-in cache) - name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: latest
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
@ -28,12 +32,7 @@ jobs:
cache: pnpm cache: pnpm
cache-dependency-path: '**/pnpm-lock.yaml' cache-dependency-path: '**/pnpm-lock.yaml'
- name: Setup pnpm - name: Install dependencies (root)
uses: pnpm/action-setup@v4
with:
version: latest
- name: Install deps (root)
run: pnpm install --frozen-lockfile run: pnpm install --frozen-lockfile
- name: Run tests - name: Run tests

2
.github/workflows/pr.yml

@ -36,7 +36,7 @@ jobs:
cache: pnpm cache: pnpm
cache-dependency-path: '**/pnpm-lock.yaml' cache-dependency-path: '**/pnpm-lock.yaml'
- name: Install dependencies (root) - name: Install dependencies
run: pnpm install --frozen-lockfile run: pnpm install --frozen-lockfile
- name: Run linter - name: Run linter

17
.github/workflows/release-packages.yml

@ -18,18 +18,20 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
# Node + pnpm (with cache) - name: Setup pnpm
- name: Setup Node uses: pnpm/action-setup@v4
with:
version: latest
- name: Setup Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
cache: pnpm cache: pnpm
cache-dependency-path: '**/pnpm-lock.yaml' cache-dependency-path: '**/pnpm-lock.yaml'
- name: Setup pnpm - name: Install dependencies
uses: pnpm/action-setup@v4 run: pnpm install --frozen-lockfile
with:
version: latest
- name: Configure npm auth - name: Configure npm auth
env: env:
@ -38,9 +40,6 @@ jobs:
pnpm config set //registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN} pnpm config set //registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
pnpm config set registry https://registry.npmjs.org/ pnpm config set registry https://registry.npmjs.org/
- name: Install deps (root)
run: pnpm install
- name: Resolve package list - name: Resolve package list
id: pkgs id: pkgs
shell: bash shell: bash

19
.github/workflows/release-web.yml

@ -62,7 +62,11 @@ jobs:
echo "push_latest=$PUSH_LATEST" >> "$GITHUB_OUTPUT" echo "push_latest=$PUSH_LATEST" >> "$GITHUB_OUTPUT"
echo "Resolved tag: $TAG (push_latest=$PUSH_LATEST)" echo "Resolved tag: $TAG (push_latest=$PUSH_LATEST)"
# --- Setup Node.js and pnpm (with cache) --- - name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: latest
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
@ -70,14 +74,17 @@ jobs:
cache: pnpm cache: pnpm
cache-dependency-path: '**/pnpm-lock.yaml' cache-dependency-path: '**/pnpm-lock.yaml'
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: latest
- name: Install dependencies - name: Install dependencies
run: pnpm install --frozen-lockfile run: pnpm install --frozen-lockfile
- name: Build web package
working-directory: packages/web
run: pnpm run build
- name: Build web package
working-directory: packages/web
run: pnpm run build
- name: Create Web App Release Archive - name: Create Web App Release Archive
working-directory: packages/web working-directory: packages/web
run: pnpm run package run: pnpm run package

2
packages/transport-web-serial/package.json

@ -1,6 +1,6 @@
{ {
"name": "@meshtastic/transport-web-serial", "name": "@meshtastic/transport-web-serial",
"version": "0.2.3-1", "version": "0.2.4-0",
"description": "A transport layer for Meshtastic applications using Web Serial API.", "description": "A transport layer for Meshtastic applications using Web Serial API.",
"exports": { "exports": {
".": "./mod.ts" ".": "./mod.ts"

2
packages/web/package.json

@ -1,6 +1,6 @@
{ {
"name": "meshtastic-web", "name": "meshtastic-web",
"version": "2.7.0-0", "version": "2.6.6-0",
"type": "module", "type": "module",
"description": "Meshtastic web client", "description": "Meshtastic web client",
"license": "GPL-3.0-only", "license": "GPL-3.0-only",

Loading…
Cancel
Save