From 67dfb8aec41af53c1091089a5eb8b6fcaf08a918 Mon Sep 17 00:00:00 2001
From: Todd Resudek <resudek.todd@gmail.com>
Date: Wed, 29 May 2024 07:12:35 -0600
Subject: [PATCH] Valid licenses for hexpm integration tests v2.0 (#1032)
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

* Bump to ubuntu-20.04

* More fixes

---------

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5317239b..e1344607 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   format:
     name: Format
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
 
@@ -24,7 +24,7 @@ jobs:
 
   test:
     name: Test
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     services:
       postgres:
@@ -41,10 +41,6 @@ jobs:
       fail-fast: false
       matrix:
         pair:
-          - erlang: master
-            elixir: 1.14.0
-          - erlang: 25.0
-            elixir: main
           - erlang: 25.0
             elixir: 1.14.0
           - erlang: 25.0
@@ -63,8 +59,6 @@ jobs:
             elixir: 1.7.2
           - erlang: 21.3
             elixir: 1.6.6
-          - erlang: 20.3
-            elixir: 1.5.3
 
     env:
       HEXPM_OTP: OTP-25.0
@@ -87,11 +81,11 @@ jobs:
 
       - name: Install OTP and Elixir for hexpm
         run: |
-          wget https://repo.hex.pm/builds/otp/ubuntu-16.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/setup_hexpm.exs b/test/setup_hexpm.exs
index eaf395e6..e3c0b37b 100644
--- a/test/setup_hexpm.exs
+++ b/test/setup_hexpm.exs
@@ -4,7 +4,7 @@ Hexpm.init()
 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"
 }