Merge branch 'develop' into dependabot/maven/it.unimi.dsi-fastutil-8.…

…5.12

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ develop, master, release/* ]
+    branches:
+      - develop
+      - master
+      - release
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ develop ]
@@ -48,7 +51,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,18 +62,20 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      if: matrix.language != 'java'
+      uses: github/codeql-action/autobuild@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+    - name: Build
+      if: matrix.language == 'java'
+      run: |
+        ./scripts/build_backend_version.sh "version_placeholder"
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/create_backend_branch_image.yml

@@ -0,0 +1,53 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Create and publish a backend image of specified branches
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - release
+      - staging/**
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}-backend
+
+jobs:
+  build-and-push-image-and-clean-ghcr:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          # Fetch all tags
+          fetch-depth: 0
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: type=raw,value={{branch}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/create_frontend_branch_image.yml

@@ -0,0 +1,53 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Create and publish a frontend image of specified branches
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - release
+      - staging/*
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}-frontend
+
+jobs:
+  build-and-push-image-and-clean-ghcr:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          # Fetch all tags
+          fetch-depth: 0
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: type=raw,value={{branch}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: ./frontend
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/lint_openapi.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     paths:
       - "openapi.yaml"
+      - "backend/src/main/resources/com/bakdata/conquery/external/openapi-form-backend.yaml"
       - ".github/workflows/lint_openapi.yaml"
 jobs:
   lint:
@@ -11,5 +12,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: "Lint OpenApi spec"
+      - name: "Lint OpenApi spec for /api"
         run: vacuum lint --details ./openapi.yaml
+      - name: "Lint OpenApi spec for external form backends"
+        run: vacuum lint --details ./backend/src/main/resources/com/bakdata/conquery/external/openapi-form-backend.yaml

.github/workflows/prepare-merge-release.yml

@@ -6,7 +6,7 @@ on:
       - release
 
 jobs:
-  bump-test:
+  merge-release:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:

.github/workflows/reintegrate-master.yml

@@ -6,7 +6,7 @@ on:
       - master
 
 jobs:
-  bump-test:
+  reintegrate-master:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:

.github/workflows/run_autodoc.yml

@@ -13,7 +13,7 @@ on:
       - "backend/src/main/java/com/bakdata/conquery/apiv1/**"
 
 jobs:
-  generate_auto_doc:
+  generate-auto-doc:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:

.github/workflows/test_backend.yml

@@ -1,14 +1,20 @@
 name: "Test Backend"
 
 on:
+  push:
+    branches:
+      # Always run on protected branches
+      - master
+      - develop
+      - release
   pull_request:
     paths:
       - "backend/**"
 
 jobs:
-  run_tests:
+  test:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
       - name: Cache local Maven repository
         uses: actions/cache@v2
@@ -29,8 +35,10 @@ jobs:
       - name: Build Backend
         run: mvn -T 1C install -pl backend -DskipTests -am
       - name: Unit Test
-        run: mvn test -T 1C -pl backend -DexcludedGroups="INTEGRATION_PROGRAMMATIC, INTEGRATION_JSON"
+        run: mvn test -T 1C -pl backend -DexcludedGroups="INTEGRATION_PROGRAMMATIC, INTEGRATION_JSON, INTEGRATION_SQL_BACKEND"
       - name: Programmatic Integration Tests
         run: mvn test -T 1C -pl backend -Dgroups="INTEGRATION_PROGRAMMATIC"
       - name: JSON based Integration Tests
         run: mvn test -T 1C -pl backend -Dgroups="INTEGRATION_JSON"
+      - name: SQL based Integration Tests
+        run: mvn test -T 1C -pl backend -Dgroups="INTEGRATION_SQL_BACKEND"

.github/workflows/test_build_backend_image.yml

@@ -0,0 +1,45 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Test building backend image
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+      - develop
+      - master
+    paths:
+      - 'backend/**'
+      - 'executable/**'
+      - 'Dockerfile'
+      - 'pom.xml'
+      - 'lombok.config'
+      - 'scripts/**'
+      - '.github/workflows/test_build_backend_image.yml'
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}-backend
+
+jobs:
+  test-build-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          # Fetch all tags
+          fetch-depth: 0
+
+      - name: Build docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: false

.github/workflows/test_build_frontend_image.yml

@@ -0,0 +1,40 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Test building frontend image
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+      - develop
+      - master
+    paths:
+      - 'frontend/*'
+      - 'scripts/*'
+      - '.github/workflows/test_build_frontend_image.yml'
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}-frontend
+
+jobs:
+  test-build-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          # Fetch all tags
+          fetch-depth: 0
+
+      - name: Build docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: ./frontend
+          push: false

.github/workflows/test_cypress.yml

@@ -1,12 +1,18 @@
 name: "End-To-End Tests"
 
 on:
+  push:
+    branches:
+      # Always run on protected branches
+      - master
+      - develop
+      - release
   pull_request:
     paths:
       - "**"
 
 jobs:
-  end-to-end-test:
+  test:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
@@ -41,7 +47,7 @@ jobs:
       - name: Cypress run
         # This is a preconfigured action, maintained by cypress, to run e2e tests
         # https://github.com/cypress-io/github-action
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
           working-directory: .
           start: bash ./scripts/run_e2e_all.sh

.github/workflows/test_frontend.yml

@@ -1,12 +1,18 @@
 name: "Test Frontend"
 
 on:
+  push:
+    branches:
+      # Always run on protected branches
+      - master
+      - develop
+      - release
   pull_request:
     paths:
       - "frontend/**"
 
 jobs:
-  format-lint-unittest:
+  test:
     runs-on: ubuntu-latest
     timeout-minutes: 6
     steps:
@@ -17,16 +23,16 @@ jobs:
           node-version: 18
       - name: install dependencies
         working-directory: ./frontend
-        run: yarn --ignore-platform
+        run: npm install
       - name: setup env variables
         working-directory: ./frontend
         run: cp .env.example .env
       - name: lint
         working-directory: ./frontend
-        run: yarn lint
+        run: npm run lint
       - name: check format
         working-directory: ./frontend
-        run: yarn checkformat
+        run: npm run checkformat
       - name: test
         working-directory: ./frontend
-        run: yarn test
+        run: npm run test