From 1d3f9169913a23bf5a63ce1dc7d1d16ff2453bc2 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 13 Nov 2020 14:23:24 +0100
Subject: [PATCH 1/4] Gitlab CI: Specify arm32v7 image for arm32 builds

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd0c5c8d4..168401d3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,8 +228,8 @@ arm:
   artifacts: *release-artifacts
   only: *release-only
   tags:
-    - arm32
-  image: elixir:1.10.3
+    - arm32on64
+  image: arm32v7/elixir:1.10.3
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release
@@ -240,8 +240,8 @@ arm-musl:
   artifacts: *release-artifacts
   only: *release-only
   tags:
-    - arm32
-  image: elixir:1.10.3-alpine
+    - arm32on64
+  image: arm32v7/elixir:1.10.3
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release-musl

From 27108acd0f69cc0c59f99b0fd2d2e33589fb9883 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 13 Nov 2020 14:48:40 +0100
Subject: [PATCH 2/4] Gitlab CI: Alpine is alpine

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 168401d3c..d7efdb8ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -241,7 +241,7 @@ arm-musl:
   only: *release-only
   tags:
     - arm32on64
-  image: arm32v7/elixir:1.10.3
+  image: arm32v7/elixir:1.10.3-alpine
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release-musl

From fcb1e7b750c91f7654079f776769f6b1953a5a38 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 13 Nov 2020 16:19:09 +0100
Subject: [PATCH 3/4] Gitlab CI: Change tags bag to arm32

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7efdb8ec..08dc776a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,7 +228,7 @@ arm:
   artifacts: *release-artifacts
   only: *release-only
   tags:
-    - arm32on64
+    - arm32
   image: arm32v7/elixir:1.10.3
   cache: *release-cache
   variables: *release-variables
@@ -240,7 +240,7 @@ arm-musl:
   artifacts: *release-artifacts
   only: *release-only
   tags:
-    - arm32on64
+    - arm32
   image: arm32v7/elixir:1.10.3-alpine
   cache: *release-cache
   variables: *release-variables

From ffc2bb70ff297bfe2e24afa591553a4410128fb7 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 17 Nov 2020 12:42:55 +0100
Subject: [PATCH 4/4] Gitlab CI: Specify image architecture for arm64 images

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08dc776a6..9a754ed78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -253,7 +253,7 @@ arm64:
   only: *release-only
   tags:
     - arm
-  image: elixir:1.10.3
+  image: arm64v8/elixir:1.10.3
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release
@@ -265,8 +265,7 @@ arm64-musl:
   only: *release-only
   tags:
     - arm
-  # TODO: Replace with upstream image when 1.9.0 comes out
-  image: elixir:1.10.3-alpine
+  image: arm64v8/elixir:1.10.3-alpine
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release-musl