Skip to content
Merged
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
12 changes: 6 additions & 6 deletions .github/workflows/deploy-storybook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ["20.x"]
python-version: ["3.10"]
node-version: ["24.x"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: pnpm/action-setup@v4
with:
run_install: |
args: [ --force ]

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -43,14 +43,14 @@ jobs:
PYTHONPATH=server python server/davidia/generate_openapi.py

- name: Set Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: pnpm

- name: Build and publish
id: build-publish
uses: bitovi/github-actions-storybook-to-github-pages@v1.0.3
uses: bitovi/github-actions-storybook-to-github-pages@v1
with:
checkout: false
path: storybook/storybook-static
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- uses: pnpm/action-setup@v4
with:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: ["20.x"]
python-version: ["3.10"]
node-version: ["24.x"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: pnpm/action-setup@v4
with:
run_install: |
args: [ --force ]

- name: Set Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: pnpm
Expand All @@ -41,7 +41,7 @@ jobs:
pnpm test

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install server dependencies
Expand All @@ -63,28 +63,28 @@ jobs:
pipx run build server
pipx run build server/example-client --outdir server/dist
- name: Upload sdist and wheel as artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: dist
path: server/dist

pypi:
# upload to PyPI and make a release on every tag
# Upload to PyPI and make a release on every tag
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
needs: [build]

runs-on: ubuntu-latest
permissions:
# this permission is mandatory for trusted publishing To PyPI
# This permission is mandatory for trusted publishing to PyPI
id-token: write
# This permission allows the CI to create the release environment
contents: write
# Specify the GitHub Environment to publish to
environment: release

steps:
# download sdist and wheel from dist job
- uses: actions/download-artifact@v4
# publish to PyPI using trusted publishing
# Download sdist and wheel from dist job
- uses: actions/download-artifact@v7
# Publish to PyPI using trusted publishing
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
7 changes: 5 additions & 2 deletions client/component/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "@diamondlightsource/davidia",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/DiamondLightSource/davidia.git"
"url": "git+https://github.com/DiamondLightSource/davidia.git"
},
"private": false,
"version": "1.0.4",
Expand All @@ -17,7 +18,9 @@
"files": [
"dist"
],
"main": "src/index.ts",
"exports": {
".": "./src/index.ts"
},
"publishConfig": {
"main": "dist/index.js",
"types": "dist/index.d.ts"
Expand Down