remove mac download from geth site

src/components/UI/downloads/DownloadsHero.tsx

@@ -10,7 +10,6 @@ interface DownloadsHero {
   currentBuild: string;
   currentBuildVersion: string;
   linuxBuildURL: string;
-  macOSBuildURL: string;
   releaseNotesURL: string;
   sourceCodeURL: string;
   windowsBuildURL: string;
@@ -20,13 +19,11 @@ export const DownloadsHero: FC<DownloadsHero> = ({
   currentBuild,
   currentBuildVersion,
   linuxBuildURL,
-  macOSBuildURL,
   releaseNotesURL,
   sourceCodeURL,
   windowsBuildURL
 }) => {
   DOWNLOAD_HEADER_BUTTONS.linuxBuild.buildURL = linuxBuildURL;
-  DOWNLOAD_HEADER_BUTTONS.macOSBuild.buildURL = macOSBuildURL;
   DOWNLOAD_HEADER_BUTTONS.windowsBuild.buildURL = windowsBuildURL;
   DOWNLOAD_HEADER_BUTTONS.sourceCode.buildURL = sourceCodeURL;
 

src/components/UI/downloads/DownloadsTable.tsx

@@ -9,7 +9,6 @@ import { ReleaseData } from '../../../types';
 
 interface Props {
   linuxData: ReleaseData[];
-  macOSData: ReleaseData[];
   windowsData: ReleaseData[];
   iOSData: ReleaseData[];
   androidData: ReleaseData[];
@@ -20,7 +19,6 @@ interface Props {
 
 export const DownloadsTable: FC<Props> = ({
   linuxData,
-  macOSData,
   windowsData,
   iOSData,
   androidData,
@@ -30,7 +28,6 @@ export const DownloadsTable: FC<Props> = ({
 }) => {
   const totalReleases = [
     linuxData.length,
-    macOSData.length,
     windowsData.length,
     iOSData.length,
     androidData.length
@@ -41,10 +38,9 @@ export const DownloadsTable: FC<Props> = ({
   const getDefaultIndex = useMemo<number>(() => {
     const OS: string = typeof window !== 'undefined' ? window.navigator.platform : '';
     const userAgent = typeof window !== 'undefined' ? window.navigator.userAgent : '';
-    if (/Mac/i.test(OS)) return 1;
+    if (/Win/i.test(OS)) return 1;
-    if (/Win/i.test(OS)) return 2;
+    if (/iPhone/i.test(OS)) return 2;
-    if (/iPhone/i.test(OS)) return 3;
+    if (/Android/i.test(userAgent)) return 3;
-    if (/Android/i.test(userAgent)) return 4;
     return 0;
   }, []);
 
@@ -67,7 +63,7 @@ export const DownloadsTable: FC<Props> = ({
             return (
               <Tab
                 key={tab}
-                w={'20%'}
+                w={'25%'}
                 p={4}
                 _selected={{
                   bg: 'primary',
@@ -90,12 +86,6 @@ export const DownloadsTable: FC<Props> = ({
               data={linuxData.slice(0, LAST_2_LINUX_RELEASES)}
             />
           </TabPanel>
-          <TabPanel p={0}>
-            <DataTable
-              columnHeaders={DOWNLOADS_TABLE_TAB_COLUMN_HEADERS}
-              data={macOSData.slice(0, amountOfReleasesToShow)}
-            />
-          </TabPanel>
           <TabPanel p={0}>
             <DataTable
               columnHeaders={DOWNLOADS_TABLE_TAB_COLUMN_HEADERS}

src/components/UI/icons/MacosLogo.tsx

@@ -1,10 +0,0 @@
-import { createIcon } from '@chakra-ui/icons';
-
-export const MacosLogo = createIcon({
-  displayName: 'MacosLogo',
-  viewBox: '0 0 25 30',
-  d: 'M25 22.01c-.982 2.85-3.924 7.896-6.954 7.951-2.01.039-2.656-1.191-4.954-1.191-2.296 0-3.015 1.154-4.915 1.229C4.962 30.122 0 22.715 0 16.254 0 10.32 4.135 7.38 7.747 7.325c1.938-.035 3.768 1.307 4.95 1.307 1.186 0 3.408-1.613 5.744-1.377.978.041 3.724.394 5.487 2.972C19.25 13.279 19.98 19.663 25 22.009zM18.473 0c-3.533.143-6.416 3.849-6.013 6.914 3.265.254 6.398-3.406 6.013-6.914z',
-  defaultProps: {
-    color: 'bg'
-  }
-});

src/components/UI/icons/index.ts

@@ -6,6 +6,5 @@ export * from './MoonIcon';
 export * from './SunIcon';
 export * from './TwitterIcon';
 export * from './SourceBranch';
-export * from './MacosLogo';
 export * from './LinuxPenguin';
 export * from './WindowsLogo';

src/constants.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { IconProps } from '@chakra-ui/react';
-import { WindowsLogo, MacosLogo, LinuxPenguin, SourceBranch } from './components/UI/icons';
+import { WindowsLogo, LinuxPenguin, SourceBranch } from './components/UI/icons';
 
 export const BORDER_WIDTH = '2px';
 
@@ -39,12 +39,6 @@ export const DOWNLOAD_HEADER_BUTTONS: {
     Svg: LinuxPenguin,
     buildURL: ''
   },
-  macOSBuild: {
-    name: 'macOS',
-    ariaLabel: 'macOS logo',
-    Svg: MacosLogo,
-    buildURL: ''
-  },
   windowsBuild: {
     name: 'Windows',
     ariaLabel: 'Windows logo',
@@ -58,7 +52,7 @@ export const DOWNLOAD_HEADER_BUTTONS: {
     buildURL: ''
   }
 };
-export const DOWNLOADS_TABLE_TABS = ['Linux', 'macOS', 'Windows', 'iOS', 'Android'];
+export const DOWNLOADS_TABLE_TABS = ['Linux', 'Windows', 'iOS', 'Android'];
 export const DOWNLOADS_TABLE_TAB_COLUMN_HEADERS = [
   'Release',
   'Commit',
@@ -103,15 +97,6 @@ export const DOWNLOADS_OPENPGP_SIGNATURES = [
     },
     fingerprint: 'FDE5 A1A0 44FA 13D2 F7AD  A019 A61A 1356 9BA2 8146'
   },
-  {
-    'build server': 'macOS Builder',
-    'unique id': 'Go Ethereum macOS Builder <geth-ci@ethereum.org>',
-    'openpgp key': {
-      label: '7B9E2481',
-      url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x558915E17B9E2481'
-    },
-    fingerprint: '6D1D AF5D 0534 DEA6 1AA7  7AD5 5589 15E1 7B9E 2481'
-  },
   {
     'build server': 'Windows Builder',
     'unique id': 'Go Ethereum Windows Builder <geth-ci@ethereum.org>',
@@ -183,8 +168,6 @@ export const LAST_COMMIT_BASE_URL = 'https://api.github.com/repos/ethereum/go-et
 export const BINARIES_BASE_URL = 'https://gethstore.blob.core.windows.net/builds/';
 export const LINUX_BINARY_BASE_URL =
   'https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-';
-export const MACOS_BINARY_BASE_URL =
-  'https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-';
 export const WINDOWS_BINARY_BASE_URL =
   'https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-';
 
@@ -195,12 +178,6 @@ export const ALL_LINUX_GETH_RELEASES_URL =
 export const ALL_LINUX_ALLTOOLS_GETH_RELEASES_URL =
   'https://gethstore.blob.core.windows.net/builds?restype=container&comp=list&prefix=geth-alltools-linux';
 
-// macOS
-export const ALL_MACOS_GETH_RELEASES_URL =
-  'https://gethstore.blob.core.windows.net/builds?restype=container&comp=list&prefix=geth-darwin';
-export const ALL_MACOS_ALLTOOLS_GETH_RELEASES_URL =
-  'https://gethstore.blob.core.windows.net/builds?restype=container&comp=list&prefix=geth-alltools-darwin';
-
 // windows
 export const ALL_WINDOWS_GETH_RELEASES_URL =
   'https://gethstore.blob.core.windows.net/builds?restype=container&comp=list&prefix=geth-windows';

src/pages/downloads.tsx

@@ -46,7 +46,6 @@ export const getStaticProps: GetStaticProps = async () => {
 
   // Latest binaries urls
   const LATEST_LINUX_BINARY_URL = getLatestBinaryURL('linux', versionNumber, commit);
-  const LATEST_MACOS_BINARY_URL = getLatestBinaryURL('darwin', versionNumber, commit);
   const LATEST_WINDOWS_BINARY_URL = getLatestBinaryURL('windows', versionNumber, commit);
 
   // Sources urls
@@ -58,7 +57,6 @@ export const getStaticProps: GetStaticProps = async () => {
     releaseName,
     urls: {
       LATEST_LINUX_BINARY_URL,
-      LATEST_MACOS_BINARY_URL,
       LATEST_WINDOWS_BINARY_URL,
       LATEST_SOURCES_URL,
       RELEASE_NOTES_URL
@@ -72,8 +70,6 @@ export const getStaticProps: GetStaticProps = async () => {
     const [
       ALL_LINUX_RELEASES_XML_DATA,
       ALL_LINUX_ALL_TOOLS_RELEASES_XML_DATA,
-      ALL_MACOS_RELEASES_XML_DATA,
-      ALL_MACOS_ALL_TOOLS_RELEASES_XML_DATA,
       ALL_WINDOWS_RELEASES_XML_DATA,
       ALL_WINDOWS_ALL_TOOLS_RELEASES_XML_DATA,
       ALL_ANDROID_RELEASES_XML_DATA,
@@ -90,13 +86,6 @@ export const getStaticProps: GetStaticProps = async () => {
     const linuxAllToolsJson = parser.parse(ALL_LINUX_ALL_TOOLS_RELEASES_XML_DATA);
     const ALL_LINUX_ALL_TOOLS_BLOBS_JSON_DATA = linuxAllToolsJson.EnumerationResults.Blobs.Blob;
 
-    // macOS
-    const macOSJson = parser.parse(ALL_MACOS_RELEASES_XML_DATA);
-    const ALL_MACOS_BLOBS_JSON_DATA = macOSJson.EnumerationResults.Blobs.Blob;
-
-    const macOSAllToolsJson = parser.parse(ALL_MACOS_ALL_TOOLS_RELEASES_XML_DATA);
-    const ALL_MACOS_ALL_TOOLS_BLOBS_JSON_DATA = macOSAllToolsJson.EnumerationResults.Blobs.Blob;
-
     // windows
     const windowsJson = parser.parse(ALL_WINDOWS_RELEASES_XML_DATA);
     const ALL_WINDOWS_BLOBS_JSON_DATA = windowsJson.EnumerationResults.Blobs.Blob;
@@ -131,24 +120,6 @@ export const getStaticProps: GetStaticProps = async () => {
       isStableRelease: false
     });
 
-    // macOS
-    const MACOS_STABLE_RELEASES_DATA = mapReleasesData({
-      blobsList: ALL_MACOS_BLOBS_JSON_DATA,
-      isStableRelease: true
-    });
-    const MACOS_ALLTOOLS_STABLE_RELEASES_DATA = mapReleasesData({
-      blobsList: ALL_MACOS_ALL_TOOLS_BLOBS_JSON_DATA,
-      isStableRelease: true
-    });
-    const MACOS_DEV_BUILDS_DATA = mapReleasesData({
-      blobsList: ALL_MACOS_BLOBS_JSON_DATA,
-      isStableRelease: false
-    });
-    const MACOS_ALLTOOLS_DEV_BUILDS_DATA = mapReleasesData({
-      blobsList: ALL_MACOS_ALL_TOOLS_BLOBS_JSON_DATA,
-      isStableRelease: false
-    });
-
     // windows
     const WINDOWS_STABLE_RELEASES_DATA = mapReleasesData({
       blobsList: ALL_WINDOWS_BLOBS_JSON_DATA,
@@ -201,15 +172,6 @@ export const getStaticProps: GetStaticProps = async () => {
             LINUX_DEV_BUILDS_DATA,
             LINUX_ALLTOOLS_DEV_BUILDS_DATA
           ),
-          // macOS
-          ALL_MACOS_STABLE_RELEASES: getSortedReleases(
-            MACOS_STABLE_RELEASES_DATA,
-            MACOS_ALLTOOLS_STABLE_RELEASES_DATA
-          ),
-          ALL_MACOS_DEV_BUILDS: getSortedReleases(
-            MACOS_DEV_BUILDS_DATA,
-            MACOS_ALLTOOLS_DEV_BUILDS_DATA
-          ),
           // windows
           ALL_WINDOWS_STABLE_RELEASES: getSortedReleases(
             WINDOWS_STABLE_RELEASES_DATA,
@@ -244,9 +206,6 @@ interface Props {
     // linux
     ALL_LINUX_STABLE_RELEASES: ReleaseData[];
     ALL_LINUX_DEV_BUILDS: ReleaseData[];
-    // macOS
-    ALL_MACOS_STABLE_RELEASES: ReleaseData[];
-    ALL_MACOS_DEV_BUILDS: ReleaseData[];
     // windows
     ALL_WINDOWS_STABLE_RELEASES: ReleaseData[];
     ALL_WINDOWS_DEV_BUILDS: ReleaseData[];
@@ -266,9 +225,6 @@ const DownloadsPage: NextPage<Props> = ({ data }) => {
     // linux
     ALL_LINUX_STABLE_RELEASES,
     ALL_LINUX_DEV_BUILDS,
-    // macOS
-    ALL_MACOS_STABLE_RELEASES,
-    ALL_MACOS_DEV_BUILDS,
     // windows
     ALL_WINDOWS_STABLE_RELEASES,
     ALL_WINDOWS_DEV_BUILDS,
@@ -304,7 +260,6 @@ const DownloadsPage: NextPage<Props> = ({ data }) => {
             currentBuild={LATEST_RELEASES_DATA.releaseName}
             currentBuildVersion={LATEST_RELEASES_DATA.versionNumber}
             linuxBuildURL={LATEST_RELEASES_DATA.urls.LATEST_LINUX_BINARY_URL}
-            macOSBuildURL={LATEST_RELEASES_DATA.urls.LATEST_MACOS_BINARY_URL}
             windowsBuildURL={LATEST_RELEASES_DATA.urls.LATEST_WINDOWS_BINARY_URL}
             sourceCodeURL={LATEST_RELEASES_DATA.urls.LATEST_SOURCES_URL}
             releaseNotesURL={LATEST_RELEASES_DATA.urls.RELEASE_NOTES_URL}
@@ -364,7 +319,6 @@ const DownloadsPage: NextPage<Props> = ({ data }) => {
           >
             <DownloadsTable
               linuxData={ALL_LINUX_STABLE_RELEASES}
-              macOSData={ALL_MACOS_STABLE_RELEASES}
               windowsData={ALL_WINDOWS_STABLE_RELEASES}
               iOSData={ALL_IOS_STABLE_RELEASES}
               androidData={ALL_ANDROID_STABLE_RELEASES}
@@ -420,7 +374,6 @@ const DownloadsPage: NextPage<Props> = ({ data }) => {
           >
             <DownloadsTable
               linuxData={ALL_LINUX_DEV_BUILDS}
-              macOSData={ALL_MACOS_DEV_BUILDS}
               windowsData={ALL_WINDOWS_DEV_BUILDS}
               iOSData={ALL_IOS_DEV_BUILDS}
               androidData={ALL_ANDROID_DEV_BUILDS}

src/types.ts

@@ -3,7 +3,6 @@ export interface LatestReleasesData {
   releaseName: string;
   urls: {
     LATEST_LINUX_BINARY_URL: string;
-    LATEST_MACOS_BINARY_URL: string;
     LATEST_WINDOWS_BINARY_URL: string;
     LATEST_SOURCES_URL: string;
     RELEASE_NOTES_URL: string;

src/utils/fetchXMLData.ts

@@ -3,8 +3,6 @@ import {
   ALL_IOS_GETH_RELEASES_URL,
   ALL_LINUX_ALLTOOLS_GETH_RELEASES_URL,
   ALL_LINUX_GETH_RELEASES_URL,
-  ALL_MACOS_ALLTOOLS_GETH_RELEASES_URL,
-  ALL_MACOS_GETH_RELEASES_URL,
   ALL_WINDOWS_ALLTOOLS_GETH_RELEASES_URL,
   ALL_WINDOWS_GETH_RELEASES_URL
 } from '../constants';
@@ -13,8 +11,6 @@ export const fetchXMLData = () => {
   const urls = [
     ALL_LINUX_GETH_RELEASES_URL,
     ALL_LINUX_ALLTOOLS_GETH_RELEASES_URL,
-    ALL_MACOS_GETH_RELEASES_URL,
-    ALL_MACOS_ALLTOOLS_GETH_RELEASES_URL,
     ALL_WINDOWS_GETH_RELEASES_URL,
     ALL_WINDOWS_ALLTOOLS_GETH_RELEASES_URL,
     ALL_ANDROID_GETH_RELEASES_URL,

src/utils/getLatestBinaryURL.ts

@@ -1,13 +1,10 @@
 import {
   LINUX_BINARY_BASE_URL,
-  MACOS_BINARY_BASE_URL,
   WINDOWS_BINARY_BASE_URL
 } from '../constants';
 
 export const getLatestBinaryURL = (os: string, versionNumber: string, commit: string) => {
   if (os === 'linux') return `${LINUX_BINARY_BASE_URL}${versionNumber.slice(1)}-${commit}.tar.gz`;
 
-  if (os === 'darwin') return `${MACOS_BINARY_BASE_URL}${versionNumber.slice(1)}-${commit}.tar.gz`;
-
   return `${WINDOWS_BINARY_BASE_URL}${versionNumber.slice(1)}-${commit}.exe`;
 };