From db4f8427b7294b47fe68dac955f51991bd2c2263 Mon Sep 17 00:00:00 2001 From: Peter Chang Date: Mon, 15 Dec 2025 10:55:58 +0000 Subject: [PATCH 1/3] Update CI actions and package metadata --- .github/workflows/deploy-storybook.yaml | 8 ++++---- .github/workflows/npm-publish.yaml | 2 +- .github/workflows/python-package.yml | 10 +++++----- client/component/package.json | 7 +++++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index bdd09348..9b644b75 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -21,7 +21,7 @@ jobs: python-version: ["3.10"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: pnpm/action-setup@v4 with: @@ -29,7 +29,7 @@ jobs: 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 }} @@ -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 diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index 0c0e1332..586cb43b 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - uses: pnpm/action-setup@v4 with: diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f2280dc2..c0c9a115 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -20,7 +20,7 @@ jobs: python-version: ["3.10"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: pnpm/action-setup@v4 with: @@ -28,7 +28,7 @@ jobs: 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 @@ -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 @@ -63,7 +63,7 @@ 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 @@ -84,7 +84,7 @@ jobs: steps: # download sdist and wheel from dist job - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v7 # publish to PyPI using trusted publishing - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/client/component/package.json b/client/component/package.json index f721efbf..b9f42fae 100644 --- a/client/component/package.json +++ b/client/component/package.json @@ -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", @@ -17,7 +18,9 @@ "files": [ "dist" ], - "main": "src/index.ts", + "exports": { + ".": "./src/index.ts" + }, "publishConfig": { "main": "dist/index.js", "types": "dist/index.d.ts" From d848a2874837b110edeae17b1a28388df26287a2 Mon Sep 17 00:00:00 2001 From: Peter Chang Date: Mon, 15 Dec 2025 10:59:37 +0000 Subject: [PATCH 2/3] Update Python CI to use Node 24 and Python 3.12 --- .github/workflows/deploy-storybook.yaml | 4 ++-- .github/workflows/python-package.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index 9b644b75..10666590 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -17,8 +17,8 @@ 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@v6 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index c0c9a115..d63f2be8 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,8 +16,8 @@ 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@v6 From 735c86e82818f348d02ad144b53a4767373fb9cc Mon Sep 17 00:00:00 2001 From: Peter Chang Date: Mon, 15 Dec 2025 11:04:43 +0000 Subject: [PATCH 3/3] Tweak CI comments --- .github/workflows/python-package.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index d63f2be8..c0ff8fe9 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -69,13 +69,13 @@ jobs: 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 @@ -83,8 +83,8 @@ jobs: environment: release steps: - # download sdist and wheel from dist job + # Download sdist and wheel from dist job - uses: actions/download-artifact@v7 - # publish to PyPI using trusted publishing + # Publish to PyPI using trusted publishing - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1