Merge main

.eslintrc-whitespace.json

@@ -0,0 +1,23 @@
+{
+	"root": true,
+	"parser": "any-eslint-parser",
+	"ignorePatterns": [
+		"test/**/results",
+		"!.github",
+		"!deploy",
+		"package-lock.json",
+		"pnpm/**/**",
+		"pnpm-lock.yaml",
+		"*.properties",
+		"*.ts",
+		"*.js",
+		"*.json",
+		"*.yml",
+		"*.yaml",
+		"*.json",
+		"*.png"
+	],
+	"rules": {
+		"eol-last": [ "error", "always" ]
+	}
+}

.eslintrc.json

@@ -0,0 +1,64 @@
+{
+	"root": true,
+	"extends": [
+		"wikimedia/selenium",
+		"wikimedia/language/es2019",
+		"@wmde/wikimedia-typescript"
+	],
+	"ignorePatterns": [
+		"**/results/result.json",
+		"!.github/**/**",
+		"!deploy",
+		"package-lock.json",
+		"pnpm/**/**",
+		"pnpm-lock.yaml",
+		"*.properties"
+	],
+	"parserOptions": {
+		"sourceType": "module",
+		"allowImportExportEverywhere": true,
+		"ecmaVersion": "latest"
+	},
+	"rules": {
+		"mocha/no-setup-in-describe": "warn",
+		"node/no-missing-import": "off",
+		"wdio/no-pause": "warn",
+		"es-x/no-import-meta": "off",
+		"es-x/no-nullish-coalescing-operators": "off",
+		"es-x/no-class-fields": "off",
+		"no-mixed-spaces-and-tabs": [ "error", "smart-tabs" ],
+		"eol-last": [ "error", "always" ]
+	},
+	"overrides": [
+		{
+			"files": [ "*.json" ],
+			"rules": {
+				"array-bracket-spacing": "off",
+				"quotes": "off",
+				"quote-props": [ "error", "consistent" ],
+				"@typescript-eslint/semi": "off",
+				"no-unused-expressions": "off"
+			}
+		},
+		{
+			"files": [ "*.yaml", "*.yml" ],
+			"parser": "yaml-eslint-parser",
+			"rules": {
+				"max-len": "off",
+				"spaced-comment": "off",
+				"yml/block-sequence": 1,
+				"yml/no-empty-mapping-value": 1,
+				"yml/plain-scalar": 1
+			}
+		},
+		{
+			"files": [ "docker-compose*.yaml", "docker-compose*.yml" ],
+			"parser": "yaml-eslint-parser",
+			"rules": {
+				"yml/indent": 1,
+				"yml/no-empty-mapping-value": "off",
+				"yml/plain-scalar": "off"
+			}
+		}
+	]
+}

.githooks/pre-commit

@@ -1,3 +1,3 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
-./lint.sh
+./nx lint

.github/actions/pull-ghcr/action.yml

@@ -1,21 +1,10 @@
 name: pull-ghcr
-description: Pull all from GHCR
-inputs:
-  github_token:
-    description: token to access GHCR
-    required: true
+description: Pull all images from GHCR (for current run ID)
 
 runs:
   using: composite
 
   steps:
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ inputs.github_token }}
-
     - shell: bash
       run: |
         set -x

.github/actions/push-ghcr/action.yml

@@ -2,22 +2,13 @@ name: push-ghcr
 description: Push to GHCR
 inputs:
   docker_image:
-    description: name of the docker image to push
-    required: true
-  github_token:
-    description: token to access GHCR
+    description: name of the image to push
     required: true
 
 runs:
   using: composite
 
   steps:
-    - uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ inputs.github_token }}
-
     - shell: bash
       run: |
         set -x

.github/actions/scan-image/action.yml

@@ -35,8 +35,8 @@ runs:
         cp ${{ steps.scan.outputs.sarif }} /tmp/sarif-reports/${{ inputs.image_name }}.sarif
 
     - name: Archive scan artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: ScanResults
+        name: dev-${{ github.run_id }}-${{ inputs.image_name }}-image-scan-results
         if-no-files-found: error
         path: /tmp/sarif-reports/${{ inputs.image_name }}.sarif

.github/actions/setup-environment/action.yml

@@ -0,0 +1,42 @@
+name: "Setup Node and Docker build environment"
+description: "Reusable action to set up the environment for builds and tests"
+inputs:
+  github_token:
+    description: token to access GHCR
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9.6.0
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20
+        cache: 'pnpm'
+
+    - name: Install Javascript dependencies (PNPM)
+      shell: bash
+      run: pnpm install
+
+    - name: Setup QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Setup a Docker Buildx builder
+      id: builder
+      uses: docker/setup-buildx-action@v3
+      with:
+        platforms: linux/amd64,linux/arm64
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ inputs.github_token }}
+
+    - name: Set NX to run locally using Node vs in Docker dev runner container
+      shell: bash
+      run: echo "NX_RUN_LOCAL=true" >> $GITHUB_ENV

.github/workflows/_build_test.yml

@@ -9,17 +9,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Lint
-        run: ./lint.sh
+      - uses: ./.github/actions/setup-environment
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: ./nx lint
 
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
 
     strategy:
       fail-fast: false
       matrix:
-        component:
+        imageName:
           - wikibase
           - elasticsearch
           - wdqs
@@ -29,21 +32,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
-      - run: ./build.sh ${{ matrix.component }}
-
-      # TODO re-enable as soon as we make use of it
-      # - name: Scan Image
-      #   uses: ./.github/actions/scan-image
-      #   continue-on-error: true
-      #   with:
-      #     image_name: ${{ matrix.component }}
-
-      - uses: ./.github/actions/push-ghcr
+
+      - uses: ./.github/actions/setup-environment
         with:
-          docker_image: wikibase/${{ matrix.component }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build and push ${{ matrix.imageName }}
+        run: ./nx build ${{ matrix.imageName }} --push
+
   test:
     needs: build
     runs-on: ubuntu-latest
@@ -63,28 +59,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
-      - uses: ./.github/actions/pull-ghcr
+  
+      - uses: ./.github/actions/setup-environment
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: ./test.sh ${{ matrix.suite }}
+      - name: "Pull images from GHCR"
+        uses: ./.github/actions/pull-ghcr
 
-      - name: Reporter
-        run: |
-          cd .github/reporter
-          npm install
-          node report.js ${{ matrix.suite }}
+      - name: "Run ${{ matrix.suite }} test suite"
+        run: ./nx test -- ${{ matrix.suite }}
 
       - name: Show logs
         run: |
           ls -lahr test/suites/${{ matrix.suite }}/results test/suites/${{ matrix.suite }}/results/*
           tail -n +1 test/suites/${{ matrix.suite }}/results/*.log
         continue-on-error: true
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: TestResults
+          name: dev-${{ github.run_id }}-${{ matrix.suite }}-test-results
           path: test/suites/**/results
 
   test-success: