Update circle-ci and releases

Author: jamesbrink

Diff for: .circleci/config.yml

@@ -1,14 +1,12 @@
 ---
+version: 2.1
 jobs:
   build:
-    branches:
-      only:
-        - main
     machine:
       image: 'ubuntu-1604:202004-01'
     environment:
       DOCKER_CLI_EXPERIMENTAL: enabled
-      DOCKER_BUILDKIT: 1
+      DOCKER_BUILDKIT: "1"
       BUILD_PROGRESS: plain
     steps:
       - checkout
@@ -34,7 +32,5 @@ jobs:
           name: Build Docker Images
           command: |
             echo "$DOCKERHUB_PASS" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin
-            LLVM_VERSION=8 BASE_IMAGE='alpine:3.10' make all
-            LLVM_VERSION=9 BASE_IMAGE='alpine:3.11' make all
-            LLVM_VERSION=10 BASE_IMAGE='alpine:3.12' make all
-            LLVM_VERSION=10 BASE_IMAGE='alpine:edge' make all
+            make all
+            make push-readme

Diff for: Dockerfile

@@ -54,12 +54,7 @@ ARG MESA_VERSION
 RUN set -xe; \
     mkdir -p /var/tmp/build; \
     cd /var/tmp/build/; \
-    if [ "$MESA_VERSION" == "latest" ]; \
-    then \
-        git clone --depth=1 --branch=master https://gitlab.freedesktop.org/mesa/mesa.git; \
-    else \
-        git clone --depth=1 --branch=mesa-${MESA_VERSION} https://gitlab.freedesktop.org/mesa/mesa.git; \
-    fi
+    git clone --depth=1 --branch=mesa-${MESA_VERSION} https://gitlab.freedesktop.org/mesa/mesa.git;
 
 # Build Mesa from source.
 ARG BUILD_TYPE=release

Diff for: Makefile

@@ -12,8 +12,9 @@ TAG_SUFFIX              ?= $(shell echo "-$(BASE_IMAGE)" | $(SED) 's|:|-|g' | $(
 VCS_REF                 := $(shell git rev-parse --short HEAD)
 BUILD_DATE              := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 PLATFORMS               ?= linux/amd64,linux/386,linux/arm64,linux/arm/v7
-RELEASES                ?= stable 20.0.6 20.1.0-rc1 latest
+RELEASES                ?= stable 20.0.6 20.1.1 20.1.2
 STABLE                  ?= 20.0.6
+LATEST                  ?= 20.1.2
 BUILD_PROGRESS          ?= auto
 BUILD_OUTPUT            ?= type=registry
 BUILD_TYPE              ?= release
@@ -42,6 +43,9 @@ $(RELEASES):
 	if [ "$(@)" == "stable" ]; \
 	then \
 		MESA_VERSION="$(STABLE)"; \
+	elif [ "$(@)" == "latest" ]; \
+	then \
+		MESA_VERSION="$(LATEST)"; \
 	else \
 		MESA_VERSION="$(@)"; \
 	fi; \
@@ -53,6 +57,7 @@ $(RELEASES):
 		--build-arg LLVM_VERSION=$(LLVM_VERSION) \
 		--build-arg MESA_VERSION="$$MESA_VERSION"  \
 		--build-arg VCS_REF=$(VCS_REF) \
+		--cache-from $(REPO_NAMESPACE)/$(IMAGE_NAME):$(@)$(TAG_SUFFIX) \
 		--tag $(REPO_NAMESPACE)/$(IMAGE_NAME):$(@)$(TAG_SUFFIX) \
 		--tag $(REPO_NAMESPACE)/$(IMAGE_NAME):$(@) \
 		--platform=$(PLATFORMS) \