QD-8148 Optimize internal builds

JetBrains · Feb 21, 2025 · 3c28bd8 · 3c28bd8
1 parent 28bf493
commit 3c28bd8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 37 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -19,13 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["next", "2024.3", "2025.1"]
-        group: ["default", "more", "clang"]
-        include:
-          - version: "next"
-            group: "ruby"
-          - version: "2025.1"
-            group: "ruby"
+        version: ["next", "2025.1"]
+        group: ["default", "more", "clang", "ruby"]
     runs-on: ubuntu-latest
     steps:
       - name: Clean up

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,35 +13,35 @@ on:
     - cron: '0 0 * * 1'
 
 jobs:
-#  build243:
-#    name: "2024.3"
-#    strategy:
-#      matrix:
-#        platform: [ linux/amd64 ]  # linux/arm64
-#        linter: [ android-community, android, dotnet, go, js, jvm, jvm-community, php, python, python-community, dotnet-community, cpp, cnova ]
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#      - uses: dorny/paths-filter@v3
-#        id: changes
-#        with:
-#          filters: |
-#            dockerfile:
-#              - '2024.3/${{ matrix.linter }}/Dockerfile'
-#      - if: steps.changes.outputs.dockerfile == 'true'
-#        name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - if: steps.changes.outputs.dockerfile == 'true'
-#       name: Build
-#        uses: docker/build-push-action@v6
-#        with:
-#          tags: jetbrains/qodana-${{ matrix.linter }}:2024.3
-#          context: 2024.3/${{ matrix.linter }}
-#          platforms: ${{ matrix.platform }}
-#          push: false
-#          cache-from: type=gha
-#          cache-to: type=gha,mode=max,ignore-error=true
+  build243:
+    name: "2024.3"
+    strategy:
+      matrix:
+        platform: [ linux/amd64 ]  # linux/arm64
+        linter: [ android-community, android, dotnet, go, js, jvm, jvm-community, php, python, python-community, dotnet-community, cpp, cnova ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          filters: |
+            dockerfile:
+              - '2024.3/${{ matrix.linter }}/Dockerfile'
+      - if: steps.changes.outputs.dockerfile == 'true'
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - if: steps.changes.outputs.dockerfile == 'true'
+        name: Build
+        uses: docker/build-push-action@v6
+        with:
+          tags: jetbrains/qodana-${{ matrix.linter }}:2024.3
+          context: 2024.3/${{ matrix.linter }}
+          platforms: ${{ matrix.platform }}
+          push: false
+          cache-from: type=gha
+          cache-to: type=gha,mode=max,ignore-error=true
 
   build242:
     name: "2024.2"

diff --git a/2024.3/base/docker-bake.hcl b/2024.3/base/docker-bake.hcl
@@ -15,7 +15,7 @@ group "clang" {
 }
 
 group "ruby" {
-  targets = ["ruby2x", "ruby3x"]
+  targets = []
 }
 
 target "debian" {