Merge remote-tracking branch 'upstream/main' into fix-docker

gabalafou · Sep 9, 2024 · 9a400b8 · 9a400b8
2 parents d40a7cc + ecf425f
commit 9a400b8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: "Install dependencies 📦"
         run: yarn
@@ -39,7 +39,7 @@ jobs:
         run: yarn run webpack bundle
 
       - name: "Upload artifacts 📤"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: webpack-bundle
           path: dist/
diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml
@@ -8,12 +8,11 @@ name: JavaScript tests (Jest)
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -22,15 +21,18 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set Yarn to correct version
-      run: corepack enable
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        # https://github.com/actions/setup-node?tab=readme-ov-file#caching-global-packages-data
-    - run: yarn install --immutable
-      # https://yarnpkg.com/cli/install#options
-    - run: yarn test
+      - name: "Checkout repository 🛎"
+        uses: actions/checkout@v4
+      - name: "Set Yarn to correct version 📌"
+        run: corepack enable
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "yarn"
+          # https://github.com/actions/setup-node?tab=readme-ov-file#caching-global-packages-data
+      - name: "Install dependencies 📦"
+        run: yarn install --immutable
+        # https://yarnpkg.com/cli/install#options
+      - name: "Run tests 🧪"
+        run: yarn test
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -2,7 +2,7 @@ name: pages-build-and-deploy-gh-pages
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
 
   workflow_dispatch:
 
@@ -14,16 +14,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v3
+      - name: "Checkout repositorty 🛎️"
+        uses: actions/checkout@v4
 
-      - name: Install and Build 🔧
+      - name: "Install and Build 🔧"
         run: |
           corepack enable
           yarn
           yarn run storybook:build
 
-      - name: Deploy 🚀
+      - name: "Deploy pages 🚀"
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           folder: storybook-static
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22
-          registry-url: 'https://registry.npmjs.org'
+          registry-url: "https://registry.npmjs.org"
           scope: "@conda-store-ui"
 
       - name: "Set Yarn to correct version 📌"
@@ -37,7 +37,7 @@ jobs:
         run: yarn eslint:check
 
       - name: "Download webpack bundle 📦"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: webpack-bundle
           path: dist/

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,36 +22,36 @@ jobs:
       - name: "Checkout repository 🛎"
         uses: actions/checkout@v4
 
-      - name: "Set up Python"
-        uses: conda-incubator/setup-miniconda@v2
-        env:
-          CONDA_SOLVER: libmamba
+      - name: "Set up Python 🐍"
+        uses: conda-incubator/setup-miniconda@v3
         with:
+          mamba-version: "*"
+          channels: conda-forge
           activate-environment: cs-ui-dev-env
           environment-file: environment_dev.yml
           auto-activate-base: false
 
-      - name: "Set up environment variables"
+      - name: "Set up environment variables 🔨"
         run: |
           cp .env.example .env
 
-      - name: "Set Yarn to correct version"
+      - name: "Set Yarn to correct version 📌"
         run: corepack enable
 
-      - name: "Install Dependencies"
+      - name: "Install Dependencies 📦"
         run: |
           sudo apt install wait-for-it -y
           playwright install chromium
           yarn install --immutable
           yarn run build
 
-      - name: "Start web server and run tests"
+      - name: "Start web server and run tests 🧪"
         shell: bash -el {0}
         run: |
           yarn run start & pytest --video on --output test-results --screenshots true test/playwright/test_ux.py
 
-      - name: "Upload artifacts"
-        uses: actions/upload-artifact@v3
+      - name: "Upload artifacts 📤"
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: playwright-tests