From 3ae7ec05e807b24530717410bd8b7feb8ab3b430 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Mon, 19 Dec 2022 10:56:21 -0600 Subject: [PATCH 1/3] add almalinux and rocky linux --- src/supermarket/app/helpers/supported_platforms_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/supermarket/app/helpers/supported_platforms_helper.rb b/src/supermarket/app/helpers/supported_platforms_helper.rb index 92f7bc03a0..2353532257 100644 --- a/src/supermarket/app/helpers/supported_platforms_helper.rb +++ b/src/supermarket/app/helpers/supported_platforms_helper.rb @@ -12,6 +12,7 @@ module SupportedPlatformsHelper def supported_platform_icon(platform) { "aix" => "aix", + "almalinux" => "almalinux", "amazon" => "aws", "centos" => "centos", "debian" => "debian", @@ -24,6 +25,7 @@ def supported_platform_icon(platform) "opensuse" => "suse", "opensuseleap" => "suse", "redhat" => "redhat", + "rocky" => "rocky", "scientific" => "scientific", "smartos" => "smartos", "suse" => "suse", From abf7ec8ba27de2aa2277f37c7c12d108c5f72646 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Mon, 19 Dec 2022 12:17:13 -0600 Subject: [PATCH 2/3] add logo images Signed-off-by: Corey Hemminger --- .../app/assets/images/platform_almalinux.png | Bin 0 -> 2582 bytes .../app/assets/images/platform_almalinux.svg | 18 ++++++++++++++++++ .../app/assets/images/platform_rocky.png | Bin 0 -> 1483 bytes .../app/assets/images/platform_rocky.svg | 10 ++++++++++ 4 files changed, 28 insertions(+) create mode 100644 src/supermarket/app/assets/images/platform_almalinux.png create mode 100644 src/supermarket/app/assets/images/platform_almalinux.svg create mode 100644 src/supermarket/app/assets/images/platform_rocky.png create mode 100644 src/supermarket/app/assets/images/platform_rocky.svg diff --git a/src/supermarket/app/assets/images/platform_almalinux.png b/src/supermarket/app/assets/images/platform_almalinux.png new file mode 100644 index 0000000000000000000000000000000000000000..2a6d1cb036d69eec9e985d0305eb4fd2dd28b46b GIT binary patch literal 2582 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 literal 0 HcmV?d00001 diff --git a/src/supermarket/app/assets/images/platform_almalinux.svg b/src/supermarket/app/assets/images/platform_almalinux.svg new file mode 100644 index 0000000000..5ffb045d2f --- /dev/null +++ b/src/supermarket/app/assets/images/platform_almalinux.svg @@ -0,0 +1,18 @@ + + + platform_almalinux + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/supermarket/app/assets/images/platform_rocky.png b/src/supermarket/app/assets/images/platform_rocky.png new file mode 100644 index 0000000000000000000000000000000000000000..1bd8c3938e648a12d26e51368c11abc74cf700a6 GIT binary patch literal 1483 zcmV;+1vL7JP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91JfH&r1ONa40RR91JOBUy0E^%0TmS$CHAzH4RA>d=TTP1vDO|l4#8_|`DVs;^j%gIJY%#dhE7SV*{ zoO*pL_3l)4efE0~FWj!Ld+)iY`m4J8y{?;;O*D6AyQZxZDE{?mx6)g4&?k@B$*|g+ z{nFR{>@;*F+qTwph1h`u)3({_e2kHFik&`^IQzgXol8M;eA?$gevJuP4yIpc814 zY{AN`T43>?!Oz); z5}>9u;Jmii1QB03r{px3eqYJ^h`FKo22=Y4(6Deeu>{OrEEUAH3jsRVrW#7X+&bNW zv3e?CECDkf1LJrM(7kHe6^BMgn=|me^z%v+0?z@|F@_Ql?CxU)UISQ^z&)Fazv51* z1{i7|_lJx3mH_?|3ag(dLU!!u0r7Uo0Au%|To-atMorqsu!{;GtR~PMD6c+T*>gp^ z3FQ^Asql#BJ$7jSxnsQUR|%)g4VYW!-7Z^r^UekG*>f?GEL`*Zg4Fay53Hi5cJ@5K-f-W(OpIk%^U~LX$psUw>vj|3 znagWS&>lMq&TD%$TVX1oQVucajim}W1R4W3@2g6uItDrf{zoa}RL~Ik(-PoZP#^g1 zT;L(l4-o7pK?#&{z~2Kh;S?gy*6*q2Q`4MFE28D z5*(Uhu4HbwPV=nugBRCuWL&ePqAz1G*33sVv==I$13mQ~Gqjgd$B4ByZ^nGWdJRoY zax6RMU_M2SF#(4WbOIeK`P#V5jX72egN*TZpq60BpSczj-+*%{@Ur(a_heax64z$JIDT$Fv zlzF;RN}OD)o@z=+(x;TDOPcju;(Q7-9|TJi&-H6XlzF?7N_>Y-PoTMp=h}}&)FsV& zjQAZIZ9;Piq}taI<@=rJCrA?TNQn4N+VaB-kL^?vDR#9)-Ioe{2iSu6Z-{dMYUC?y zQ;5WDS`yV*wZy;dx!Pj8g7la~TN1ZqrNUqNYk;BlJc;T&YWBGBHRV`3BKap&GsPe~%-$JiIt3}>vRR{6}IEKE9&`+S}pl6|6BJ#f!R89>4OGDj* lK8HSo^8U*8z@O0O@*jBc)_c%_t_c7D002ovPDHLkV1m?Jx(omS literal 0 HcmV?d00001 diff --git a/src/supermarket/app/assets/images/platform_rocky.svg b/src/supermarket/app/assets/images/platform_rocky.svg new file mode 100644 index 0000000000..f684ceb419 --- /dev/null +++ b/src/supermarket/app/assets/images/platform_rocky.svg @@ -0,0 +1,10 @@ + + + platform_rocky + + + + + + + \ No newline at end of file From 7ad2101ef3b680501968879aaaee16e494fbc835 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Mon, 19 Dec 2022 12:44:11 -0600 Subject: [PATCH 3/3] fix github tests Signed-off-by: Corey Hemminger --- .github/workflows/brakeman-analysis.yml | 2 +- .github/workflows/ctl-cookbook-testing.yml | 4 ++-- .github/workflows/docs-lint.yml | 4 ++-- .github/workflows/lint.yml | 6 +++--- .github/workflows/unit.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml index 67f862bf6d..369a003fef 100644 --- a/.github/workflows/brakeman-analysis.yml +++ b/.github/workflows/brakeman-analysis.yml @@ -20,7 +20,7 @@ jobs: steps: # Checkout the repository to the GitHub Actions runner - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Customize the ruby version depending on your needs - name: Setup Ruby diff --git a/.github/workflows/ctl-cookbook-testing.yml b/.github/workflows/ctl-cookbook-testing.yml index 3c102112b4..02c9ce5a7d 100644 --- a/.github/workflows/ctl-cookbook-testing.yml +++ b/.github/workflows/ctl-cookbook-testing.yml @@ -13,7 +13,7 @@ jobs: cookstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: working-directory: omnibus @@ -26,7 +26,7 @@ jobs: chefspec: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: # once we move the -ctl command to its own gemspec this can be changed back to omnibus like above diff --git a/.github/workflows/docs-lint.yml b/.github/workflows/docs-lint.yml index ae08bd311d..9ccf96feb0 100644 --- a/.github/workflows/docs-lint.yml +++ b/.github/workflows/docs-lint.yml @@ -20,7 +20,7 @@ jobs: cspell-action: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: "${{ secrets.GITHUB_TOKEN }}" - uses: carlosperate/download-file-action@v1.0.3 @@ -49,7 +49,7 @@ jobs: markdownlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: "${{ secrets.GITHUB_TOKEN }}" - uses: DavidAnson/markdownlint-cli2-action@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5162ae62fe..381e2d2598 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,13 +8,13 @@ name: lint - main paths-ignore: - 'docs-chef-io' - + jobs: chefstyle-supermarket: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: working-directory: src/supermarket @@ -27,7 +27,7 @@ jobs: chefstyle-fieri: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: working-directory: src/supermarket/engines/fieri diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index cf6176fd5f..20b01b7174 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -26,7 +26,7 @@ jobs: ports: ["6379:6379"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up ruby 3.1 uses: ruby/setup-ruby@v1 with: @@ -66,7 +66,7 @@ jobs: ports: ["6379:6379"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up ruby 3.1 uses: ruby/setup-ruby@v1 with: