#109 Promoting aarch64 Workstation to primary.
Closed 8 months ago by codeblock. Opened 8 months ago by meherc.
fedora-web/ meherc/websites b1  into  master

@@ -18,6 +18,7 @@ 

          live_i386: false

          netinst_x86_64: false

          netinst_i386: false

+         live_aarch64: false

  

      server:

        pretty_name: Fedora Server
@@ -52,6 +53,7 @@ 

        download_override:

          live_x86_64: default

          netinst_x86_64: default

+         live_aarch64: https://dl.fedoraproject.org/pub/fedora-secondary/releases/test/32_Beta/Workstation/aarch64/images/Fedora-Workstation-32_Beta-1.2.aarch64.raw.xz

  

      server:

        pretty_name: Fedora Server Beta

@@ -29,19 +29,19 @@ 

                Get started by using <strong>Fedora Media Writer</strong>, which makes it super easy to give Fedora a try.

                {% endtrans %}

              </p>

-             <ul class="mt-auto list-group">

+             <ul class="mt-5 list-group">

                <li class="list-group-item d-flex align-items-center p-2">

                  <div class="flex-grow-1">

                    {% trans trimmed %}Fedora Media Writer{% endtrans %}

                  </div>

-                 <div class="btn-group">

+                 <div class="btn-group">                

                    <a class="btn btn-outline-fedora-blue" href="https://getfedora.org/fmw/FedoraMediaWriter-win32-{{releaseinfo.fmw.win.version}}.exe">

                      <i class="fab fa-windows"></i> 

                    </a>

-                   <a class="btn btn-outline-fedora-blue" href="https://getfedora.org/fmw/FedoraMediaWriter-osx-{{releaseinfo.fmw.osx.version}}.dmg">

+                   <a class="btn btn-outline-fedora-blue" href="https://getfedora.org/fmw/FedoraMediaWriter-win32-{{releaseinfo.fmw.win.version}}.exe">

                      <i class="fab fa-apple"></i> 

                    </a>

-                 </div>

+                 </div>               

                </li>

              </ul>

            </div>
@@ -54,6 +54,7 @@ 

                Not sure how to use this file? <a href="{{link}}">Learn here</a>.

                {% endtrans %}

              </p>

+             <div class="mt-3 mb-3 font-weight-light">For x86_64:</div>

              <ul class="mt-auto list-group">

                {% if releaseinfo.ga.editions.workstation.download_override.live_x86_64 %}

                <li class="list-group-item d-flex align-items-center p-2">
@@ -83,6 +84,41 @@ 

                  </div>

                </li>

                {% endif %}

+             </ul>

+ 

+             <div class="mt-3 mb-3 font-weight-light">For ARM<sup>&reg;</sup> aarch64:</div>

+             <ul class="mt-auto list-group">

+ 

+               {% if releaseinfo.ga.editions.workstation.download_override.live_aarch64 %}

+               <li class="list-group-item d-flex align-items-center p-2">

+                 <div class="flex-grow-1">

+                   {% trans trimmed n=releaseinfo.ga.editions.workstation.release_number %}

+                   Fedora {{n}}: aarch64 raw image

+                   {% endtrans %}

+                 </div>

+                 <div class="btn-group">

+                   <a class="btn btn-outline-fedora-blue" href="{{dl(releaseinfo.ga.editions.workstation.download_override.live_aarch64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/%s/Workstation/aarch64/images/Fedora-Workstation-%s-%s.aarch64.raw.xz' % (releaseinfo.ga.editions.workstation.release_number, releaseinfo.ga.editions.workstation.release_number, releaseinfo.ga.editions.workstation.rc_version))}}">

+                     {% trans trimmed %}Download{% endtrans %}

+                   </a>

+                 </div>

+               </li>

+               {% endif %}

+ 

+               {% if releaseinfo.beta.show and releaseinfo.beta.editions.workstation.download_override.live_aarch64 %}

+               <li class="list-group-item d-flex align-items-center p-2">

+                 <div class="flex-grow-1">

+                   {% trans trimmed n=releaseinfo.beta.editions.workstation.release_number %}

+                   Fedora {{n}}: aarch64 raw image

+                   {% endtrans %}

+                   <span class="badge badge-primary">{% trans trimmed %}Beta!{% endtrans %}</span>

+                 </div>

+                 <div class="btn-group">

+                   <a class="btn btn-outline-fedora-blue" href="{{dl(releaseinfo.beta.editions.workstation.download_override.live_aarch64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/test/%s_Beta/Workstation/aarch64/images/Fedora-Workstation-%s_Beta-%s.aarch64.raw.xz' % (releaseinfo.beta.editions.workstation.release_number, releaseinfo.beta.editions.workstation.release_number, releaseinfo.beta.editions.workstation.rc_version))}}">

+                     {% trans trimmed %}Download{% endtrans %}

+                   </a>

+                 </div>

+               </li>

+               {% endif %}

  

              </ul>

            </div>

@@ -20,6 +20,7 @@ 

    "aliyun": "Alibaba Cloud",

    "metal": {

      "raw.xz": "Raw",

+     "4k.raw.xz": "Raw (4k Native)",

      "iso": "ISO",

      "pxe": "PXE",

      "installer.iso": "Installer (ISO)",
@@ -33,14 +34,14 @@ 

  // innerText of tab button

  const tabInnerText = {

    "cloud_launchable": "Cloud Launchable",

-   "metal_virt": "Bare Metal & Virtualized",

-   "cloud_operator": "For Cloud Operators"

+   "metal_virtualized": "Bare Metal & Virtualized",

+   "cloud_operators": "For Cloud Operators"

  }

  // frequently used IDs

  const IdPool = {

    "cloud_launchable": "cloud-launchable",

-   "metal_virt": "metal-virt",

-   "cloud_operator": "cloud-operator"

+   "metal_virtualized": "metal-virtualized",

+   "cloud_operators": "cloud-operators"

  }

  function getMember(obj, member) {

    return (member in obj) ? obj[member] : null;
@@ -142,6 +143,8 @@ 

          const key = pair[0];

          const val = pair[1];

          if (val === e.target.innerText) {

+           const downloadPageUrl = window.location.href.match(/^.*\/coreos\/download/)[0];

+           history.pushState(null, null, `${downloadPageUrl}?tab=${key}&stream=${coreos_download_app.stream}`);

            const show_id = IdPool[key];

            id_list.map(id => document.getElementById(id).hidden = (id !== show_id));

            this.shownId = show_id;
@@ -154,7 +157,7 @@ 

        nav_cloud_launchable = h('li', { class: "nav-item col-4" }, [ nav_cloud_launchable_btn ]);

  

        server_icon = h('i', { class: "fas fa-server mr-2" })

-       nav_metal_virt_btn = h('button', { class: "nav-link col-12 h-100 overflow-hidden".concat(this.shownId === IdPool.metal_virt ? " active" : ""), attrs: { "data-toggle": "tab" }, on: { click: this.toggleHidden } }, [ server_icon, tabInnerText.metal_virt ]);

+       nav_metal_virt_btn = h('button', { class: "nav-link col-12 h-100 overflow-hidden".concat(this.shownId === IdPool.metal_virtualized ? " active" : ""), attrs: { "data-toggle": "tab" }, on: { click: this.toggleHidden } }, [ server_icon, tabInnerText.metal_virtualized ]);

        nav_metal_virt = h('li', { class: "nav-item col-4" }, [ nav_metal_virt_btn ]);

  

        cloud_upload_icon = h('i', { class: "fas fa-cloud-upload-alt mr-2" })
@@ -166,6 +169,7 @@ 

      },

      // Add dropdown options of streams

      getStreamName: function(h) {

+       const self = this;

        if (this.streamData === null) return;

        option_stable = h('option', { attrs: { value: "stable", selected: this.stream === "stable" ? "selected" : null }}, "stable");

        option_testing = h('option', { attrs: { value: "testing", selected: this.stream === "testing" ? "selected" : null }}, "testing");
@@ -173,7 +177,10 @@ 

          class: "mx-1",

          on: {

            change: function(e) {

+             const downloadPageUrl = window.location.href.match(/^.*\/coreos\/download/)[0];

+             const currentShownKey = Object.keys(IdPool).find(key => IdPool[key] === self.shownId);

              coreos_download_app.stream = e.target.value;

+             history.pushState(null, null, `${downloadPageUrl}?tab=${currentShownKey}&stream=${coreos_download_app.stream}`);

            }

          }

        }, [
@@ -273,8 +280,18 @@ 

          const release = getMember(artifacts[platform], "release");

          const formats = getMember(artifacts[platform], "formats");

          if (formats) {

+           prettyFormats = [];

+           // in the case where each individual format has a separate pretty

+           // name, we want the artifacts listed in alphabetical order

            for (var format in formats) {

-             const prettyPlatform = getPrettyPlatform(platform, format);

+               pretty = getPrettyPlatform(getPrettyPlatform(platform, format));

+               prettyFormats.push({format: format, pretty: pretty});

+           }

+           prettyFormats.sort(function(a, b) { return a.pretty.localeCompare(b.pretty); });

+           for (i = 0; i < prettyFormats.length; i++) {

+             const format = prettyFormats[i].format;

+             const prettyPlatform = prettyFormats[i].pretty;

+ 

              // XXX: the conditions to display the extension here are quickly

              // hacked in; if adding any further conditions this should be

              // handled elsewhere in a better organized structure.

I have updated the release.yaml file to include aarch64 Workstation, and I have added the required download override links for F32 Beta, and set it to false for GA so as to not display F31 for now. And I have added the corrected links in the index.html file.

Metadata Update from @codeblock:
- Request assigned

8 months ago

Rebased as 685cbc6 and merged, thank you!

Pull-Request has been closed by codeblock

8 months ago