Merge branch 'main' into dev

datarhei · Jun 7, 2024 · 6872ba0 · 6872ba0
2 parents 18fc8ab + 69d3155
commit 6872ba0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/.github/workflows/build_base.yaml b/.github/workflows/build_base.yaml
@@ -75,14 +75,6 @@ jobs:
               id: buildx
               uses: docker/setup-buildx-action@master
 
-            - name: Cache Docker layers
-              uses: actions/cache@v4
-              with:
-                  path: /tmp/.buildx-cache
-                  key: ${{ runner.os }}-buildx-${{ github.sha }}
-                  restore-keys: |
-                      ${{ runner.os }}-buildx-
-
             - name: Login to DockerHub
               if: github.event_name != 'pull_request'
               uses: docker/login-action@v3
@@ -103,5 +95,3 @@ jobs:
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
-                  cache-from: type=local,src=/tmp/.buildx-cache
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new
diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml
@@ -19,12 +19,6 @@ jobs:
                       platforms: linux/amd64,linux/arm64,linux/arm/v7
                       branch: vod
                       key: alpine3.19
-                    - os: alpine
-                      os_version: "3.16"
-                      golang: golang:1.19-alpine3.16
-                      platforms: linux/amd64,linux/arm64,linux/arm/v7
-                      branch: vod
-                      key: alpine3.16
 
         steps:
             - name: Checkout