From 7d75b6ef42afe423158c573b931037aa0fdf2800 Mon Sep 17 00:00:00 2001 From: Sae126V Date: Thu, 25 Jul 2024 15:53:13 +0100 Subject: [PATCH 1/3] Update code to reflect the el8 and el9 rpms (cherry picked from commit dac552718d9f523c0bc74fbe50857c3408b92da9) --- _layouts/downloads.html | 82 ++++++++++++++++++++--------------- _layouts/home.html | 5 ++- _layouts/latest.html | 25 +++++------ downloads/latest/EL8/index.md | 5 +++ downloads/latest/EL9/index.md | 5 +++ 5 files changed, 72 insertions(+), 50 deletions(-) create mode 100644 downloads/latest/EL8/index.md create mode 100644 downloads/latest/EL9/index.md diff --git a/_layouts/downloads.html b/_layouts/downloads.html index c235e45..84d5cf2 100644 --- a/_layouts/downloads.html +++ b/_layouts/downloads.html @@ -15,35 +15,42 @@

APEL

-

SL6

- - Source RPM - Client - Server - Lib - Parsers -

SL7

- Source RPM Client Server Lib Parsers + + +

EL8

+ Client + Server + Lib + Parsers + + +

EL9

+ Client + Server + Lib + Parsers

APEL SSM

-

SL6

- - Source RPM - Client -

SL7

- Source RPM - Client + Client + + +

EL8

+ Client + + +

EL9

+ Client
@@ -70,24 +77,28 @@

SL7

var rpms = []; - for (var x = 0; x < 10; x++) { + for (var x = 0; x < 15; x++) { var data = json[objCount].assets[x].name; rpms.push(json[objCount].assets[x]); } - //SL6 Elements - document.getElementById("sl6-src-download").href = rpms[0].browser_download_url; - document.getElementById("sl6-client-download").href = rpms[2].browser_download_url; - document.getElementById("sl6-lib-download").href = rpms[4].browser_download_url; - document.getElementById("sl6-parsers-download").href = rpms[6].browser_download_url; - document.getElementById("sl6-server-download").href = rpms[8].browser_download_url; - - //SL7 Elements - document.getElementById("sl7-src-download").href = rpms[1].browser_download_url; - document.getElementById("sl7-client-download").href = rpms[3].browser_download_url; - document.getElementById("sl7-lib-download").href = rpms[5].browser_download_url; - document.getElementById("sl7-parsers-download").href = rpms[7].browser_download_url; + // SL7 Elements + document.getElementById("sl7-client-download").href = rpms[0].browser_download_url; + document.getElementById("sl7-lib-download").href = rpms[3].browser_download_url; + document.getElementById("sl7-parsers-download").href = rpms[6].browser_download_url; document.getElementById("sl7-server-download").href = rpms[9].browser_download_url; + + // EL8 Elements + document.getElementById("el8-client-download").href = rpms[1].browser_download_url; + document.getElementById("el8-lib-download").href = rpms[4].browser_download_url; + document.getElementById("el8-parsers-download").href = rpms[7].browser_download_url; + document.getElementById("el8-server-download").href = rpms[10].browser_download_url; + + // EL9 Elements + document.getElementById("el9-client-download").href = rpms[2].browser_download_url; + document.getElementById("el9-lib-download").href = rpms[5].browser_download_url; + document.getElementById("el9-parsers-download").href = rpms[8].browser_download_url; + document.getElementById("el9-server-download").href = rpms[11].browser_download_url; //Set HREFs to relevant urls $(".apel-version").text("APEL version " + json[objCount].tag_name); @@ -168,14 +179,15 @@

SL7

rpms.push(json[objCount].assets[x]); } - //SL6 Elements - document.getElementById("ssm-sl6-src-download").href = rpms[1].browser_download_url; - document.getElementById("ssm-sl6-client-download").href = rpms[0].browser_download_url; + // SL7 Elements + document.getElementById("ssm-sl7-client-download").href = rpms[0].browser_download_url; - //SL7 Elements - document.getElementById("ssm-sl7-src-download").href = rpms[3].browser_download_url; - document.getElementById("ssm-sl7-client-download").href = rpms[2].browser_download_url; + // EL8 Elements + document.getElementById("ssm-el8-client-download").href = rpms[1].browser_download_url; + // EL9 Elements + document.getElementById("ssm-el9-client-download").href = rpms[2].browser_download_url; + //Set HREFs to relevant urls $(".apelssm-version").text("SSM version " + json[objCount].tag_name); diff --git a/_layouts/home.html b/_layouts/home.html index 3f34342..edd69e7 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -9,8 +9,9 @@

Download APEL

- Download SL6 RPM - Download SL7 RPM + Download SL7 RPM + Download EL8 RPM + Download EL9 RPM View On GitHub
diff --git a/_layouts/latest.html b/_layouts/latest.html index b9d18ca..368f0e4 100644 --- a/_layouts/latest.html +++ b/_layouts/latest.html @@ -14,9 +14,8 @@

- + - Source RPM Client Server Lib @@ -35,12 +34,13 @@

// Successful JSON request .success(function (json) { - var type = document.getElementById("sl-type").textContent; + var type = document.getElementById("el-type").textContent; - if (type == "SL6") { - type = "el6"; - } - else { + if (type == "El9") { + type = "el9"; + } else if (type == "El8") { + type = "el8"; + } else { type = "el7"; } @@ -54,7 +54,7 @@

var rpms = []; - for (var x = 0; x < 10; x++) { + for (var x = 0; x < 15; x++) { var data = json[objCount].assets[x].name; if (data.indexOf(type) >= 0) { @@ -62,11 +62,10 @@

} } - document.getElementById("apel-src-download").href= rpms[0].browser_download_url; - document.getElementById("apel-client-download").href= rpms[1].browser_download_url; - document.getElementById("apel-lib-download").href= rpms[2].browser_download_url; - document.getElementById("apel-parsers-download").href= rpms[3].browser_download_url; - document.getElementById("apel-server-download").href= rpms[4].browser_download_url; + document.getElementById("apel-client-download").href= rpms[0].browser_download_url; + document.getElementById("apel-lib-download").href= rpms[1].browser_download_url; + document.getElementById("apel-parsers-download").href= rpms[2].browser_download_url; + document.getElementById("apel-server-download").href= rpms[3].browser_download_url; //Set HREFs to relevant urls $(".version").text("APEL version: " + json[objCount].tag_name); diff --git a/downloads/latest/EL8/index.md b/downloads/latest/EL8/index.md new file mode 100644 index 0000000..36f9d9a --- /dev/null +++ b/downloads/latest/EL8/index.md @@ -0,0 +1,5 @@ +--- +layout: latest +title: Latest EL8 APEL Packages +type: EL8 +--- \ No newline at end of file diff --git a/downloads/latest/EL9/index.md b/downloads/latest/EL9/index.md new file mode 100644 index 0000000..c62f19e --- /dev/null +++ b/downloads/latest/EL9/index.md @@ -0,0 +1,5 @@ +--- +layout: latest +title: Latest EL9 APEL Packages +type: EL9 +--- \ No newline at end of file From 293bfe9ccaab05d7114b48c31f5230c19efe0a6b Mon Sep 17 00:00:00 2001 From: Sae126V Date: Wed, 7 Aug 2024 11:18:03 +0100 Subject: [PATCH 2/3] Upgrade rvm to pin the ruby version - Update code to fix the link and improve comments --- .travis.yml | 3 ++- index.md | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d52432f..4af8a48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: ruby -rvm: 2.7.4 +rvm: 3.3.3 # Pinned it to this version because the current stable + # version 3.3.4 isn't available in 'travis-ci-language-archive' yet cache: bundler diff --git a/index.md b/index.md index 1a87d87..17c0ece 100644 --- a/index.md +++ b/index.md @@ -23,7 +23,7 @@ Statistics are available for view in different detail by Users, VO Managers, Sit [![GitHub issues](https://img.shields.io/github/issues-raw/apel/apel.svg)](https://github.com/apel/apel/issues) [![codecov](https://codecov.io/gh/apel/apel/branch/dev/graph/badge.svg?token=YetTFdOZo0)](https://codecov.io/gh/apel/apel) -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/a8cdc36c46b241e6a77428fbfb6f23bd)](https://www.codacy.com/gh/apel/apel/dashboard) +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/a8cdc36c46b241e6a77428fbfb6f23bd)](https://app.codacy.com/gh/apel/apel/dashboard) [![Maintainability](https://api.codeclimate.com/v1/badges/03094b74f5fc4f728bc7/maintainability)](https://codeclimate.com/github/apel/apel/maintainability) ### SSM @@ -32,5 +32,5 @@ Statistics are available for view in different detail by Users, VO Managers, Sit [![GitHub issues](https://img.shields.io/github/issues-raw/apel/ssm.svg)](https://github.com/apel/ssm/issues) [![codecov](https://codecov.io/gh/apel/ssm/branch/dev/graph/badge.svg?token=ySjD8zgHKP)](https://codecov.io/gh/apel/ssm) -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9d2b1c88ab844f0081e5fafab49b269d)](https://www.codacy.com/gh/apel/ssm/dashboard) +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9d2b1c88ab844f0081e5fafab49b269d)](https://app.codacy.com/gh/apel/ssm/dashboard) [![Maintainability](https://api.codeclimate.com/v1/badges/34aa04f3583afce2ceb2/maintainability)](https://codeclimate.com/github/apel/ssm/maintainability) From e42af99e0486edc2bfe8381ca5daa56b604637f6 Mon Sep 17 00:00:00 2001 From: Sae126V Date: Wed, 7 Aug 2024 16:16:16 +0100 Subject: [PATCH 3/3] Update code to remove hybrid comments --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4af8a48..be87b01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: ruby -rvm: 3.3.3 # Pinned it to this version because the current stable - # version 3.3.4 isn't available in 'travis-ci-language-archive' yet +rvm: 3.3.3 +# Pinned rvm to `3.3.3` version because the current stable +# version 3.3.4 isn't available in 'travis-ci-language-archive' yet cache: bundler