From c555022ea7ac2843ce10fb309367f23b5264bd41 Mon Sep 17 00:00:00 2001
From: shibao <shibao@bubbletea.dev>
Date: Tue, 19 Apr 2022 20:12:28 -0400
Subject: [PATCH] use elixir 1.13.4

---
 .drone.yml     | 8 ++++++--
 .tool-versions | 2 +-
 CHANGELOG.md   | 1 +
 Dockerfile     | 2 +-
 mix.exs        | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 49787e0..4737424 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,15 +16,19 @@ steps:
       - assets/node_modules/
 
 - name: test
-  image: bitwalker/alpine-elixir-phoenix:1.13
+  image: elixir:1.13.4-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/cannery_test
     HOST: testing.example.tld
   commands:
+  - apk add --no-cache build-base npm git python3
   - mix local.rebar --force
   - mix local.hex --force
   - mix deps.get
-  - npm install --prefix assets
+  - mix deps.compile
+  - npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
+  - npm run --prefix ./assets deploy
+  - mix do phx.digest, gettext.extract
   - mix test
 
 - name: build and publish stable
diff --git a/.tool-versions b/.tool-versions
index a50d88e..6e9c564 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-elixir 1.13.2-otp-24
+elixir 1.13.4-otp-24
 erlang 24.2
 nodejs 16.13.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index afe40a0..038a5bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - Fix not being able to edit ammo group when fully used up
 - Fix bug with average price per round calculation
 - Show average price per round on ammo type table
+- Use Elixir v1.13.4
 
 # v0.4.1
 - Fix button and tag text wrapping
diff --git a/Dockerfile b/Dockerfile
index 3c28a3e..7024fc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM elixir:1.13-alpine AS build
+FROM elixir:1.13.4-alpine AS build
 
 # install build dependencies
 RUN apk add --no-cache build-base npm git python3
diff --git a/mix.exs b/mix.exs
index d52f0e7..be4415b 100644
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Cannery.MixProject do
     [
       app: :cannery,
       version: "0.5.0",
-      elixir: "~> 1.12",
+      elixir: "1.13.4",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:gettext] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,