dataminelab
diff --git a/‎.circleci/config.yml‎
Lines changed: 1 addition & 5 deletions b/‎.circleci/config.yml‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎.circleci/docker-compose.circle.yml‎
Lines changed: 1 addition & 1 deletion b/‎.circleci/docker-compose.circle.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.circleci/docker-compose.cypress.yml‎
Lines changed: 1 addition & 1 deletion b/‎.circleci/docker-compose.cypress.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.dockerignore‎
Lines changed: 5 additions & 0 deletions b/‎.dockerignore‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.gcloud/docker-compose.server.yaml‎
Lines changed: 1 addition & 1 deletion b/‎.gcloud/docker-compose.server.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/dependabot.yml‎
Lines changed: 0 additions & 6 deletions b/‎.github/dependabot.yml‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎.github/scripts/next_version.sh‎
Lines changed: 16 additions & 0 deletions b/‎.github/scripts/next_version.sh‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎.github/workflows/pre-merge.yaml‎
Lines changed: 4 additions & 94 deletions b/‎.github/workflows/pre-merge.yaml‎
Lines changed: 4 additions & 94 deletions
diff --git a/‎.github/workflows/release.yaml‎
Lines changed: 49 additions & 0 deletions b/‎.github/workflows/release.yaml‎
Lines changed: 49 additions & 0 deletions
diff --git a/‎.github/workflows/test-unit.yaml‎
Lines changed: 99 additions & 0 deletions b/‎.github/workflows/test-unit.yaml‎
Lines changed: 99 additions & 0 deletions
@@ -8,14 +8,12 @@ build-docker-image-job: &build-docker-image-job
     - checkout
     - run: sudo apt update
     - run: sudo apt install python3-pip
-    - run: sudo pip3 install -r requirements_bundles.txt
     - run: .circleci/update_version
-    - run: npm run bundle
     - run: .circleci/docker_build
 jobs:
   backend-lint:
     docker:
-      - image: circleci/python:3.7.0
+      - image: circleci/python:3.8
     steps:
       - checkout
       - run: sudo pip install flake8
@@ -73,9 +71,7 @@ jobs:
       - checkout
       - run: sudo apt update
       - run: sudo apt install python3-pip
-      - run: sudo pip3 install -r requirements_bundles.txt
       - run: npm ci
-      - run: npm run bundle
       - run:
           name: Run App Tests
           command: npm test
 
@@ -14,7 +14,7 @@ services:
       REDASH_REDIS_URL: "redis://redis:6379/0"
       REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
   redis:
-    image: redis:3.0-alpine
+    image: redis:7-alpine
     restart: unless-stopped
   postgres:
     image: postgres:9.5.6-alpine
 
@@ -54,7 +54,7 @@ services:
       CYPRESS_PROJECT_ID: ${CYPRESS_PROJECT_ID}
       CYPRESS_RECORD_KEY: ${CYPRESS_RECORD_KEY}
   redis:
-    image: redis:3.0-alpine
+    image: redis:7-alpine
     restart: unless-stopped
   postgres:
     image: postgres:9.5.6-alpine
 
@@ -9,6 +9,10 @@ venv/
 coverage.xml
 .circleci/
 .github/
+*.md
+LICENSE*
+Dockerfile
+docker-compose.*
 .codeclimate.yml
 docker-compose*.yml
 netlify.toml
@@ -19,6 +23,7 @@ setup
 # Ignore client-specific files and directories
 client/.tmp/
 client/dist/
+client/cypress/
 
 # Ignore Plywood server files and directories
 plywood/server/node_modules/
 
@@ -35,7 +35,7 @@ services:
     volumes:
       - .:/app
   redis:
-    image: redis:6-alpine
+    image: redis:7-alpine
     restart: unless-stopped
     ports:
       - "6379:6379"
 
@@ -17,12 +17,6 @@ updates:
     schedule:
       interval: 'weekly'
       day: 'saturday'
-  - directory: "/bin"
-    package-ecosystem: "pip"
-    schedule:
-      interval: "monthly"
-    ignore:
-    - dependency-name: "*"
   - directory: "/"
     target-branch: "develop"
     package-ecosystem: "pip"
 
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+GIT_COMMIT=`git rev-parse --short=8 HEAD`
+
+if [[ "${GITHUB_REF_TYPE-""}" == "tag" ]]; then
+  PREFIX="stable"
+elif [[ "${BRANCH-""}" == "master" ]]; then
+  PREFIX="stable"
+else
+  PREFIX="develop"
+fi
+
+#create version
+NEW_TAG="$PREFIX-$(date '+%Y.%-m.%-d-%H%M')-$GIT_COMMIT"
+echo $NEW_TAG
@@ -1,105 +1,15 @@
 name: Pre-merge CI
 on:
+  workflow_call:
   pull_request:
     branches:
       - develop
-  push:
-    branches:
-      - develop
-      - main
 
 concurrency:
   cancel-in-progress: true
   group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
-  PythonLint:
-    timeout-minutes: 5
-    runs-on:  ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.7'
-      - shell: bash
-        run: |-
-          python -m pip install -r  requirements_bundles.txt flake8 --user
-      - shell: bash
-        run: |-
-          export PATH=$PATH:/builder/home/.local/bin
-          ./bin/flake8_tests.sh
-  PythonUnitTests:
-    timeout-minutes: 30
-
-    runs-on:  ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: v0.12.1
-      - name: Build docker compose
-        uses: docker/bake-action@v4
-        with:
-          files: docker-compose.yml, docker-compose.ci.yml
-          load: true
-      - name: "Prepare test environment"
-        shell: bash
-        run: |-
-          docker compose  -f docker-compose.ci.yml up -d postgres redis
-      - name: "Wait for postgres to start"
-        shell: bash
-        run: |-
-          for i in 1 2 3 4 5; do docker compose  -f docker-compose.ci.yml run  --rm postgres psql -h postgres -U postgres -c "SELECT 1 FROM pg_database WHERE datname = 'tests'"  && break || sleep 2; done
-      - name: "Create tests database"
-        shell: bash
-        run: |-
-          docker compose  -f docker-compose.ci.yml run  --rm postgres psql -h postgres -U postgres -c "create database tests;"
-      - name: "List Enabled Query Runners"
-        shell: bash
-        run: |-
-          docker compose  -f docker-compose.ci.yml run  --rm server manage ds list_types
-      - name: "Execute unit tests"
-        shell: bash
-        run: |-
-          docker compose  -f docker-compose.ci.yml run  --user 0 --name tests server tests --junitxml=junit.xml --cov-report xml --cov=redash --cov-config .coveragerc tests/
-      - name: "Extract test results"
-        shell: bash
-        if: always()
-        run: |
-          docker cp tests:/app/coverage.xml ./coverage.xml
-          docker cp tests:/app/junit.xml ./results.xml
-          ls -l
-      - name: "Publish unit test report"
-        uses: mikepenz/action-junit-report@v4
-        if: always()
-        with:
-          fail_on_failure: true
-          report_paths: results.xml
-          require_tests: true
-          include_passed: true
-          summary: true
-          job_summary: true
-          check_name: "Unit Tests Report"
-      - name: Code Coverage Report
-        uses: irongut/[email protected]
-        with:
-          filename: coverage.xml
-          badge: true
-          fail_below_min: true
-          format: markdown
-          hide_branch_rate: false
-          hide_complexity: true
-          indicators: true
-          output: both
-          thresholds: '60 80'
-      - name: Add Coverage PR Comment
-        uses: marocchino/sticky-pull-request-comment@v2
-        if: github.event_name == 'pull_request'
-        with:
-          recreate: true
-          path: code-coverage-results.md
+  unit_tests:
+    uses: ./.github/workflows/test-unit.yaml
+    secrets: inherit
@@ -0,0 +1,49 @@
+name: Release docker Image
+on:
+  push:
+    branches:
+      - develop
+      - main
+
+concurrency:
+  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  unit_tests:
+    uses: ./.github/workflows/test-unit.yaml
+    secrets: inherit
+  release_image:
+    runs-on: ubuntu-latest
+    needs:
+      - unit_tests
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - id: get-version
+        name: "Get next version"
+        run: |
+          #!/bin/bash
+          next_version=$(./.github/scripts/next_version.sh)
+          echo "Next version: $next_version"
+          echo "version=$next_version" >> $GITHUB_OUTPUT
+      - name: Docker login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.GCR_URL }}
+          username: ${{ secrets.GCR_USERNAME }}
+          password: ${{ secrets.GCR_PASSWORD }}
+      - name: Build and push datareporter
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: europe-west1-docker.pkg.dev/datareporter/datareporter/datareporter:${{ steps.get-version.outputs.version }}
+
+      - name: Build and push plywood
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          context: plywood/server
+          tags: europe-west1-docker.pkg.dev/datareporter/datareporter/plywood:${{ steps.get-version.outputs.version }}
+
@@ -0,0 +1,99 @@
+name: "Unit tests"
+on:
+  workflow_call:
+
+
+jobs:
+  PythonLint:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.8'
+      - name: Install pip
+        run: |
+          python -m ensurepip --upgrade
+      - shell: bash
+        run: |-
+          pip3 install flake8
+      - shell: bash
+        run: |-
+          export PATH=$PATH:/builder/home/.local/bin
+          ./bin/flake8_tests.sh
+  PythonUnitTests:
+    timeout-minutes: 60
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: v0.12.1
+      - name: Build docker compose
+        uses: docker/bake-action@v4
+        with:
+          files: docker-compose.yml, docker-compose.ci.yml
+          load: true
+      - name: "Prepare test environment"
+        shell: bash
+        run: |-
+          docker compose -f docker-compose.ci.yml up -d postgres redis
+      - name: "Wait for postgres to start"
+        shell: bash
+        run: |-
+          for i in 1 2 3 4 5; do docker compose  -f docker-compose.ci.yml run  --rm postgres psql -h postgres -U postgres -c "SELECT 1 FROM pg_database WHERE datname = 'tests'"  && break || sleep 2; done
+      - name: "Create tests database"
+        shell: bash
+        run: |-
+          docker compose  -f docker-compose.ci.yml run  --rm postgres psql -h postgres -U postgres -c "create database tests;"
+      - name: "List Enabled Query Runners"
+        shell: bash
+        run: |-
+          docker compose  -f docker-compose.ci.yml run  --rm server manage ds list_types
+      - name: "Execute unit tests"
+        shell: bash
+        run: |-
+          docker compose  -f docker-compose.ci.yml run  --user 0 --name tests server tests --junitxml=junit.xml --cov-report xml --cov=redash --cov-config .coveragerc tests/
+      - name: "Extract test results"
+        shell: bash
+        if: always()
+        run: |
+          docker cp tests:/app/coverage.xml ./coverage.xml
+          docker cp tests:/app/junit.xml ./results.xml
+          ls -l
+      - name: "Publish unit test report"
+        uses: mikepenz/action-junit-report@v4
+        if: always()
+        with:
+          fail_on_failure: true
+          report_paths: results.xml
+          require_tests: true
+          include_passed: true
+          summary: true
+          job_summary: true
+          check_name: "Unit Tests Report"
+      - name: Code Coverage Report
+        uses: irongut/[email protected]
+        with:
+          filename: coverage.xml
+          badge: true
+          fail_below_min: true
+          format: markdown
+          hide_branch_rate: false
+          hide_complexity: true
+          indicators: true
+          output: both
+          thresholds: '60 80'
+      - name: Add Coverage PR Comment
+        uses: marocchino/sticky-pull-request-comment@v2
+        if: github.event_name == 'pull_request'
+        with:
+          recreate: true
+          path: code-coverage-results.md