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

* 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 | 29 ++++++-----------------------
 test/setup_hexpm.exs       |  2 +-
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 428dcc0b..562f1297 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-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v1
 
       - name: Install OTP and Elixir
-        uses: erlef/setup-beam@v1.9
+        uses: erlef/setup-beam@v1
         with:
           otp-version: 24
           elixir-version: 1.12
@@ -23,7 +23,7 @@ jobs:
 
   test:
     name: Test
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     services:
       postgres:
@@ -40,11 +40,6 @@ jobs:
       fail-fast: false
       matrix:
         pair:
-          # rebar3 escript fails on erlang master
-          # - erlang: master
-          #   elixir: 1.12.3
-          - erlang: 24.0
-            elixir: main
           - erlang: 24.0
             elixir: 1.12.3
           - erlang: 23.1
@@ -59,18 +54,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-24.0
@@ -85,18 +68,18 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Install OTP and Elixir
-        uses: erlef/setup-beam@v1.9
+        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-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"
 }