From 9c77a383584b983f424b510cb4d77a6be53cfeb2 Mon Sep 17 00:00:00 2001 From: deadprogram Date: Fri, 12 Jan 2024 15:59:33 +0100 Subject: [PATCH] build: use llvm-17 base image correctly for faster docker dev builds Signed-off-by: deadprogram --- .github/workflows/docker.yml | 16 +--------------- .github/workflows/llvm.yml | 4 ++-- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8842678f..6918cec0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -54,21 +54,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push LLVM base image - uses: docker/build-push-action@v5 - with: - target: tinygo-llvm-build - context: . - push: true - tags: | - tinygo/llvm-17 - tinygo/llvm-17:latest - ghcr.io/tinygo-org/llvm-17 - ghcr.io/tinygo-org/llvm-17:latest - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - name: Build and push tinygo-dev image + - name: Build and push uses: docker/build-push-action@v5 with: context: . diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml index 701438ee..d7fd574d 100644 --- a/.github/workflows/llvm.yml +++ b/.github/workflows/llvm.yml @@ -35,8 +35,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - tinygo/llvm-16 - ghcr.io/${{ github.repository_owner }}/llvm-16 + tinygo/llvm-17 + ghcr.io/${{ github.repository_owner }}/llvm-17 tags: | type=sha,format=long type=raw,value=latest