Merge pull request #65 from tinybirdco/fmt2

3.1.0

Author: alrocar

.github/workflows/ci.yml

@@ -9,6 +9,11 @@ on:
         required: false
         type: string
         default: .
+      tb_format:
+        description: "true to force formatting of Datafiles"
+        required: false
+        type: boolean
+        default: false
     secrets:
       tb_admin_token:
         required: true
@@ -19,7 +24,7 @@ jobs:
   check:
     name: Datafiles checks
     runs-on: ubuntu-latest
-    if: ${{ github.event.action != 'closed' }}
+    if: ${{ inputs.tb_format && github.event.action != 'closed' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -41,16 +46,6 @@ jobs:
           files: |
             **/*.{datasource,incl,pipe}
 
-      - name: Check all the files
-        if: ${{ steps.files.outputs.any_changed == 'true' }}
-        shell: bash
-        run: |
-          for file in ${{ steps.files.outputs.all_changed_files }}; do
-            if [[ $file != *.incl ]]; then
-              tb check "$file"
-            fi
-          done
-
       - name: Check formatting
         if: ${{ steps.files.outputs.any_changed == 'true' }}
         shell: bash
@@ -62,8 +57,6 @@ jobs:
   deploy:
     name: Deploy to CI Branch
     runs-on: ubuntu-latest
-    needs:
-      - check
     defaults:
       run:
         working-directory: ${{ inputs.data_project_dir }}
@@ -105,6 +98,9 @@ jobs:
       - name: Tinybird version
         run: tb --version
 
+      - name: Check all the data files syntax
+        run: tb check
+
       - name: Check auth
         run: tb --host ${{ secrets.tb_host }} --token ${{ secrets.tb_admin_token }} auth info
 

.github/workflows/release.yml

@@ -55,76 +55,6 @@ jobs:
           --token ${{ secrets.tb_admin_token }} \
           release promote \
           --semver $VERSION
-  rollback:
-    runs-on: ubuntu-latest
-    if: inputs.job_to_run == 'rollback'
-    defaults:
-      run:
-        working-directory: ${{ inputs.data_project_dir }}
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-          architecture: "x64"
-          cache: 'pip'
-
-      - name: Validate input
-        run: |
-          [[ "${{ secrets.tb_admin_token }}" ]] || { echo "Go to the tokens section in your Workspace, copy the 'admin token' and set TB_ADMIN_TOKEN as a Secret in your Git repository"; exit 1; }
-      - name: Install Tinybird CLI
-        run: |
-          if [ -f "requirements.txt" ]; then
-            pip install -r requirements.txt
-          else
-            pip install tinybird-cli
-          fi
-      - name: Tinybird version
-        run: tb --version
-
-      - name: Rollback Release
-        run: |
-          source .tinyenv
-          tb \
-          --host ${{ secrets.tb_host }} \
-          --token ${{ secrets.tb_admin_token }} \
-          release rollback --yes
-  rm:
-    runs-on: ubuntu-latest
-    if: inputs.job_to_run == 'rm'
-
-    defaults:
-      run:
-        working-directory: ${{ inputs.data_project_dir }}
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-          architecture: "x64"
-          cache: 'pip'
-
-      - name: Validate input
-        run: |
-          [[ "${{ secrets.tb_admin_token }}" ]] || { echo "Go to the tokens section in your Workspace, copy the 'admin token' and set TB_ADMIN_TOKEN as a Secret in your Git repository"; exit 1; }
-      - name: Install Tinybird CLI
-        run: |
-          if [ -f "requirements.txt" ]; then
-            pip install -r requirements.txt
-          else
-            pip install tinybird-cli
-          fi
-      - name: Tinybird version
-        run: tb --version
-
-      - name: Remove Release
-        run: |
-          source .tinyenv
-          tb \
-          --host ${{ secrets.tb_host }} \
-          --token ${{ secrets.tb_admin_token }} \
-          release rm  \
-          --semver $VERSION --force --yes
 
   dry_run_rm_oldest_rollback:
     name: DRY-RUN Remove latest rollback Release

.gitlab/ci_cd.yaml

@@ -328,64 +328,6 @@ variables:
       release promote \
       --semver $VERSION
 
-.release_rollback:
-  stage: release
-  image: ${IMAGE_BASE}
-  script:
-    - cd $CI_PROJECT_DIR/$DATA_PROJECT_DIR
-
-    # Create Python Virtual Environment
-    - python -m venv .venv
-    - source .venv/bin/activate
-
-    # Install Tinybird CLI
-    - |
-      if [ -f "requirements.txt" ]; then
-        pip install -r requirements.txt
-      else
-        pip install tinybird-cli
-      fi
-
-    # Tinybird version
-    - tb --version
-
-    # Promote Release
-    - |
-      source .tinyenv
-      tb \
-      --host $TB_HOST \
-      --token $TB_ADMIN_TOKEN \
-      release rollback --yes
-
-.release_rm:
-  stage: release
-  image: ${IMAGE_BASE}
-  script:
-    - cd $CI_PROJECT_DIR/$DATA_PROJECT_DIR
-
-    # Create Python Virtual Environment
-    - python -m venv .venv
-    - source .venv/bin/activate
-
-    # Install Tinybird CLI
-    - |
-      if [ -f "requirements.txt" ]; then
-        pip install -r requirements.txt
-      else
-        pip install tinybird-cli
-      fi
-
-    # Tinybird version
-    - tb --version
-
-    # Promote Release
-    - |
-      source .tinyenv
-      tb \
-      --host $TB_HOST \
-      --token $TB_ADMIN_TOKEN \
-      release rm --semver $VERSION --force --yes
-
 .dry_run_release_rm_oldest_rollback:
   stage: release
   image: ${IMAGE_BASE}

CHANGELOG.md

@@ -1,7 +1,9 @@
 v3.1.0
 ========
 
-- Add new `check` job in GitHub Actions. It checks syntax and forces format Datafiles so there are no mismatches in the project when working from the UI and git.
+- Add new `check` job in GitHub Actions. It forces format Datafiles so there are no mismatches in the project when working from the UI and git. To activate it create set a `tb_format: true` input `tinybird_ci.yml`
+- Remove `rollback` and `rm` jobs from GitHub Actions
+- Remove `release_rollback` and `release_rm` from GitLab CI.
 
 v3.0.0
 ========