cleanup

kwilteam · Mar 4, 2025 · ecceef8 · ecceef8
1 parent 21362b7
commit ecceef8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 282 deletions.
diff --git a/.github/workflows/ci-main.yaml b/.github/workflows/ci-main.yaml
@@ -107,7 +107,7 @@ jobs:
         run: |
           task test:unit
 
-      # integration test
+      # acceptance test
       - name: manual git tag
         run: |
           version=`echo ${{ github.sha }} | cut -c 1-7`

diff --git a/.github/workflows/ci-release.yaml b/.github/workflows/ci-release.yaml
diff --git a/.github/workflows/integration-test-reuse.yaml b/.github/workflows/integration-test-reuse.yaml
@@ -81,7 +81,6 @@ jobs:
       - name: Build cli binaries
         run: |
           task build:cli
-          task build:kwild
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -6,12 +6,19 @@ on:
       - main
 
 jobs:
-  kgw-test-main:
-    name: Run KGW test on main
+  kgw-test:
+    name: Run acceptance test (with KGW)
     uses: ./.github/workflows/kgw-test-reuse.yaml
     with:
       kdb-ref: main
       kgw-ref: main
       kjs-ref: main
     secrets:
       kgw-access-token: ${{ secrets.KGW_MACH_SECRET_FOR_KWILDB }}
+
+#UNCOMMENT this to enable integration test on main branch update
+#  integration-test:
+#    name: Run integration test
+#    uses: ./.github/workflows/integration-test-reuse.yaml
+#    with:
+#      kdb-ref: main
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -21,8 +21,8 @@ jobs:
         shell: bash
         run: |
           version=`echo ${{ github.event.release.tag_name }} | sed 's/^v//' | cut -d '.' -f 2`
-          kgw_version=$(v9="3"; v8="3"; v7="2"; v6="1"; eval echo \${v$version})
-          kjs_version=$(v9="8"; v8="7"; v7="6"; v6="5"; eval echo \${v$version})
+          kgw_version=$(v10="4"; v9="3"; v8="3"; v7="2"; v6="1"; eval echo \${v$version})
+          kjs_version=$(v10="9"; v9="8"; v8="7"; v7="6"; v6="5"; eval echo \${v$version})
           echo "kdb_version=v0.$version" >> $GITHUB_OUTPUT
           echo "kgw_version=v0.$kgw_version" >> $GITHUB_OUTPUT
           echo "kjs_version=v0.$kjs_version" >> $GITHUB_OUTPUT
@@ -38,93 +38,4 @@ jobs:
       # kwil-js has no release branch, we'll use the latest tag of this minor version
       kjs-ref: ${{ needs.parse-release-version.outputs.vkjs }}
     secrets:
-      kgw-access-token: ${{ secrets.KGW_MACH_SECRET_FOR_KWILDB }}
-
-  build-push-image:
-    name: Build & push image
-    if: false # temporary disable
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          token: ${{ secrets.KWIL_MACH_SECRET }}
-
-      - name: Install Taskfile
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.KWIL_MACH_SECRET }}
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.23'
-          check-latest: true
-
-      - name: Install dependencies
-        env:
-          GH_ACCESS_TOKEN: ${{ secrets.KWIL_MACH_SECRET }}
-        run: |
-          go version
-          git config --global url."https://${GH_ACCESS_TOKEN}:[email protected]/kwilteam/".insteadOf "https://github.com/kwilteam/"
-          task tools
-
-      - name: Generate go vendor
-        run: |
-          task vendor
-
-      - name: configure variables
-        id: config
-        run: |
-          version=`echo ${{ github.event.release.tag_name }} | sed 's/^v//'`
-          echo "version=$version" >> $GITHUB_OUTPUT
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
-          aws-region: us-east-1
-
-      - name: Login to Amazon ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Cache Docker layers for KD
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache-kwild
-          #key: ${{ runner.os }}-buildx-kwild-${{ github.sha }}
-          key: ${{ runner.os }}-buildx-kwild
-          restore-keys: |
-            ${{ runner.os }}-buildx-kwild
-
-      - name: Build & push kwild image
-        id: docker_build_kwild
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          builder: ${{ steps.buildx.outputs.name }}
-          build-args: |
-            git_commit=${{ github.sha }}
-            version=${{ steps.config.outputs.version }}
-            build_time=${{ github.event.release.created_at }}
-          file: ./build/package/docker/kwild.dockerfile
-          push: true
-          tags: |
-            ${{ steps.login-ecr.outputs.registry }}/${{ secrets.AWS_KWILD_ECR }}:${{ steps.config.outputs.version }}
-            ${{ steps.login-ecr.outputs.registry }}/${{ secrets.AWS_KWILD_ECR }}:latest
-          cache-from: type=local,src=/tmp/.buildx-cache-kwild
-          cache-to: type=local,dest=/tmp/.buildx-cache-kwild-new
-
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache-kwild
-          mv /tmp/.buildx-cache-kwild-new /tmp/.buildx-cache-kwild
+      kgw-access-token: ${{ secrets.KGW_MACH_SECRET_FOR_KWILDB }}