Skip to content

Commit

Permalink
chore(dependencies): update storybook and revert extension changes
Browse files Browse the repository at this point in the history
  • Loading branch information
aldbr committed Nov 13, 2024
1 parent a3441b2 commit 4136147
Show file tree
Hide file tree
Showing 33 changed files with 16,748 additions and 4,702 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'latest'
node-version: 'lts/*'
cache: 'npm'
- name: Install dependencies
run: npm ci
Expand Down
41 changes: 36 additions & 5 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
config-file: release-please-config.json
manifest-file: .release-please-manifest.json

# Storybook is built and deployed to GitHub Pages
# -----------------------------------------------
# Library is built and deployed to NPM
# ------------------------------------

build-deploy-library-package:
runs-on: ubuntu-latest
Expand All @@ -43,7 +43,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'latest'
node-version: 'lts/*'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand All @@ -56,6 +56,9 @@ jobs:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
run: npx lerna publish from-package --no-push --no-private --yes

# Storybook is built and deployed to GitHub Pages
# -----------------------------------------------

build-storybook-docs:
runs-on: ubuntu-latest
permissions:
Expand All @@ -67,7 +70,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'latest'
node-version: 'lts/*'
cache: 'npm'

- name: Build documentation
Expand Down Expand Up @@ -154,7 +157,7 @@ jobs:

build-deploy-gubbins-dev-image:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && github.repository == 'DIRACGrid/diracx-web' }}
if: ${{ github.event_name != 'push' || github.repository == 'DIRACGrid/diracx-web' }}
steps:
- uses: actions/checkout@v4

Expand All @@ -176,4 +179,32 @@ jobs:
context: ./packages/extensions
push: ${{ github.event_name == 'push' && github.repository == 'DIRACGrid/diracx-web' && github.ref_name == 'main' }}
tags: ghcr.io/diracgrid/diracx-web/gubbins:dev
platforms: linux/amd64,linux/arm64

build-deploy-gubbins-release-image:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && github.repository == 'DIRACGrid/diracx-web' }}
needs: release-please
steps:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GitHub container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build Docker image
if: ${{ needs.release-please.outputs.release_created == 'true' }}
uses: docker/build-push-action@v6
with:
context: ./packages/extensions
push: true
tags: ghcr.io/diracgrid/diracx-web/gubbins:${{ needs.release-please.outputs.tag_name }}
platforms: linux/amd64,linux/arm64
2 changes: 1 addition & 1 deletion .github/workflows/diracx-web-components-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'latest'
node-version: 'lts/*'
cache: 'npm'
- name: Install dependencies
run: npm ci
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/diracx-web-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ jobs:
- name: Clone source
run: |
cd ..
git clone https://github.com/DIRACGrid/diracx-charts.git
git clone https://github.com/aldbr/diracx-charts.git
cd diracx-charts
git switch main_FEAT_npm-workspaces
- name: Start demo
run: |
cd ..
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/gubbins-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'latest'
node-version: 'lts/*'
cache: 'npm'

- name: Install dependencies
Expand All @@ -48,7 +48,9 @@ jobs:
- name: Clone source
run: |
cd ..
git clone https://github.com/DIRACGrid/diracx-charts.git
git clone https://github.com/aldbr/diracx-charts.git
cd diracx-charts
git switch main_FEAT_npm-workspaces
# Runs the demo with the extension source code
- name: Start demo
Expand Down Expand Up @@ -90,4 +92,4 @@ jobs:
with:
browser: chrome
config: baseUrl=${{ env.DIRACX_URL }}
project: diracx-web/packages/extensions
project: packages/extensions
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ This repository is organized as a monorepo, with the following key packages:

### Project Management

- [**Lerna**](https://lerna.js.org/docs/introduction): Utilized for efficient monorepo management. Useful to run scripts or commands across all packages while handling errors correctly.
- [**npm**](https://docs.npmjs.com/): Used for dependency management.
- [**Release-Please**](https://github.com/googleapis/release-please): Automated release management for the project.

Expand Down
Loading

0 comments on commit 4136147

Please sign in to comment.