From a05384affd821444e6e6098da20ff19fe2bf5623 Mon Sep 17 00:00:00 2001
From: Meghan <hello@nektro.net>
Date: Mon, 16 Nov 2020 13:07:54 -0800
Subject: [PATCH] switch back to debian based image

---
 .circleci/config.yml | 11 +++++------
 build_all.sh         |  2 +-
 build_all_zig.sh     |  2 +-
 changelog.sh         |  2 +-
 download_zig.sh      |  7 +++----
 make_release.sh      |  6 +++---
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1c30d15a08822fe8265d305b8d13b8dccbaa953a..6f2868278b8ee5d2255be95f7a05bb24bd8abcb0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,16 +5,15 @@ jobs:
   build:
     working_directory: /home/circleci/zigmod
     docker:
-      - image: alpine:edge
+      - image: golang
     environment:
-      GOPATH: /usr/lib/go
+      DEBIAN_FRONTEND: noninteractive
     steps:
-      - run: apk update
-      - run: apk add git
+      - run: apt update
+      - run: apt -y upgrade
       - checkout
       - run: git submodule update --init --recursive
 
-      - run: apk add go
       - run: go version
       - run: go env
       - run: go get -v .
@@ -24,10 +23,10 @@ jobs:
           path: ./bin/
           destination: /artifacts/
 
+      - run: apt -y install xz-utils jq
       - run: ./download_zig.sh 0.7.0
       - run: zig version
       - run: zig env
-      - run: apk add jq grep
       - run: ./build_all_zig.sh
       - store_artifacts:
           path: ./zig-cache/bin/
diff --git a/build_all.sh b/build_all.sh
index 955bda05d62928f34bf44f787f6cbe52cc828241..f05fabb33f6af4f06c74cf6b88f46a2deecc12c3 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/build_all_zig.sh b/build_all_zig.sh
index 287ec255153974e4b8e822fc51a92400963f2119..b978937f0fe2ba291cdc1bcd0ccc9ea4b31fd176 100755
--- a/build_all_zig.sh
+++ b/build_all_zig.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/changelog.sh b/changelog.sh
index e55d2eb9c0d9ba5b42b1443b796cd08292f4571e..c8229766a1b439c28dbb042fdfec50de9e5e805b 100755
--- a/changelog.sh
+++ b/changelog.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/download_zig.sh b/download_zig.sh
index ee3f08b4aadf415cec154832951a6291c4d8bcc8..bc76d8294a902779722f3fe86eebc559cd6f422d 100755
--- a/download_zig.sh
+++ b/download_zig.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -x
 set -e
@@ -10,8 +10,7 @@ version="$1"
 dir="zig-$os-$arch-$version"
 file="$dir.tar.xz"
 
-cd ~
-apk add wget tar
+cd /
 wget https://ziglang.org/download/$version/$file
 tar -vxf $file
-ln -s ~/$dir/zig /bin
+ln -s /$dir/zig /usr/local/bin
diff --git a/make_release.sh b/make_release.sh
index 4a13f4b06d63f5a51f394fdb5c61a07092effb8c..a862678ea7c65677f46f497102ede782afe7110c 100755
--- a/make_release.sh
+++ b/make_release.sh
@@ -1,15 +1,15 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
 date=$(date +'%Y.%m.%d')
 version=${CIRCLE_BUILD_NUM-$date}
 tag=v$version-$(git log --format=%h -1)
-go get -v -u github.com/tcnksm/ghr
+go get -v github.com/tcnksm/ghr
 $GOPATH/bin/ghr \
     -t ${GITHUB_TOKEN} \
     -u ${CIRCLE_PROJECT_USERNAME} \
     -r ${CIRCLE_PROJECT_REPONAME} \
-    -b "$(sh ./changelog.sh)" \
+    -b "$(./changelog.sh)" \
     "$tag" \
     "/artifacts/"
-- 
2.54.0