From 52b1ef103d4b6858144d211f2844022340c6b856 Mon Sep 17 00:00:00 2001
From: Todd Resudek <resudek.todd@gmail.com>
Date: Wed, 29 May 2024 08:59:57 -0600
Subject: [PATCH] Valid licenses for hexpm integration tests v0.20 (#1034)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* This adds valid licenses for test.

* Bump to ubuntu-20.04

---------

Co-authored-by: Todd Resudek <toddresudek@gmail.com>
Co-authored-by: Eric Meadows-Jönsson <eric.meadows.jonsson@gmail.com>
---
 .github/workflows/main.yml | 22 +++++-----------------
 test/test_helper.exs       |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c3f88bcd..2237b5b73 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,12 +5,12 @@ on: [push, pull_request]
 jobs:
   format:
     name: Format
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v1
 
       - name: Install OTP and Elixir
-        uses: actions/setup-elixir@v1
+        uses: erlef/setup-beam@v1
         with:
           otp-version: 22.2
           elixir-version: 1.10.0
@@ -50,18 +50,6 @@ jobs:
             elixir: 1.7.2
           - erlang: 21.3
             elixir: 1.6.6
-          - erlang: 20.3
-            elixir: 1.5.3
-          - erlang: 20.2
-            elixir: 1.4.5
-          - erlang: 19.3
-            elixir: 1.3.4
-          - erlang: 19.3
-            elixir: 1.2.6
-          - erlang: 18.3
-            elixir: 1.1.1
-          - erlang: 17.5
-            elixir: 1.0.5
 
     env:
       HEXPM_OTP: OTP-22.2
@@ -76,18 +64,18 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Install OTP and Elixir
-        uses: ericmj/setup-elixir@3f15364
+        uses: erlef/setup-beam@v1
         with:
           otp-version: ${{matrix.pair.erlang}}
           elixir-version: ${{matrix.pair.elixir}}
 
       - name: Install OTP and Elixir for hexpm
         run: |
-          wget https://repo.hex.pm/builds/otp/ubuntu-14.04/${HEXPM_OTP}.tar.gz
+          wget https://builds.hex.pm/builds/otp/ubuntu-20.04/${HEXPM_OTP}.tar.gz
           mkdir -p ${HEXPM_OTP_PATH}
           tar -xf ${HEXPM_OTP}.tar.gz -C ${HEXPM_OTP_PATH} --strip-components=1
           ${HEXPM_OTP_PATH}/Install -minimal $(pwd)/${HEXPM_OTP_PATH}
-          wget https://repo.hex.pm/builds/elixir/${HEXPM_ELIXIR}.zip
+          wget https://builds.hex.pm/builds/elixir/${HEXPM_ELIXIR}.zip
           unzip -d ${HEXPM_ELIXIR_PATH} ${HEXPM_ELIXIR}.zip
           mkdir -p ${HEXPM_MIX_HOME}
           PATH=$(pwd)/${HEXPM_ELIXIR_PATH}/bin:$(pwd)/${HEXPM_OTP_PATH}/bin:${PATH} MIX_HOME=$(pwd)/${HEXPM_MIX_HOME} MIX_ARCHIVES=$(pwd)/${HEXPM_MIX_HOME} mix local.hex --force
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 8e4b4ac2f..50c2c6fef 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -17,7 +17,7 @@ unless :integration in ExUnit.configuration()[:exclude] do
   Hexpm.start()
 
   pkg_meta = %{
-    "licenses" => ["GPL2", "MIT", "Apache"],
+    "licenses" => ["GPL-2.0", "MIT", "Apache-2.0"],
     "links" => %{"docs" => "http://docs", "repo" => "http://repo"},
     "description" => "Some description"
   }