From 47e532d4b091e55911766c94d9b16b7bbb8df7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Wed, 7 Apr 2021 19:52:46 +0200
Subject: [PATCH] ci: build on alpine/latest, not edge

---
 .builds/alpine-x64.yml |  3 +--
 .gitlab-ci.yml         | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.builds/alpine-x64.yml b/.builds/alpine-x64.yml
index be5bb0d3..3884e66b 100644
--- a/.builds/alpine-x64.yml
+++ b/.builds/alpine-x64.yml
@@ -1,5 +1,4 @@
-
-image: alpine/edge
+image: alpine/latest
 packages:
   - musl-dev
   - eudev-libs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index add26132..3037cd03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ variables:
   GIT_SUBMODULE_STRATEGY: normal
 
 before_script:
-  - echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
   - apk update
   - apk add musl-dev linux-headers meson ninja gcc scdoc ncurses
   - apk add libxkbcommon-dev pixman-dev freetype-dev fontconfig-dev harfbuzz-dev
@@ -15,7 +14,7 @@ before_script:
   - apk add ttf-hack font-noto-emoji
 
 debug-x64:
-  image: alpine:edge
+  image: alpine:latest
   stage: build
   script:
     - mkdir -p bld/debug
@@ -28,7 +27,7 @@ debug-x64:
       junit: bld/debug/meson-logs/testlog.junit.xml
 
 release-x64:
-  image: alpine:edge
+  image: alpine:latest
   stage: build
   script:
     - mkdir -p bld/release
@@ -41,7 +40,7 @@ release-x64:
       junit: bld/release/meson-logs/testlog.junit.xml
 
 debug-x86:
-  image: i386/alpine:edge
+  image: i386/alpine:latest
   stage: build
   script:
     - mkdir -p bld/debug
@@ -54,7 +53,7 @@ debug-x86:
       junit: bld/debug/meson-logs/testlog.junit.xml
 
 release-x86:
-  image: i386/alpine:edge
+  image: i386/alpine:latest
   stage: build
   script:
     - mkdir -p bld/release
@@ -67,7 +66,7 @@ release-x86:
       junit: bld/release/meson-logs/testlog.junit.xml
 
 codespell:
-  image: alpine:edge
+  image: alpine:latest
   stage: build
   script:
     - apk add python3