From 403ee36dec008997dfaaaedfa8c6451e72c061c2 Mon Sep 17 00:00:00 2001 From: Corwin Smith Date: Fri, 4 Apr 2025 07:02:07 -0600 Subject: [PATCH] fix: remove mac download from geth site (#31555) - Removes mac download from /downloads page - Removes mac download related content - Removes mac download related code and assets --- src/components/UI/downloads/DownloadsHero.tsx | 3 -- .../UI/downloads/DownloadsTable.tsx | 19 ++++---- src/components/UI/icons/MacosLogo.tsx | 10 ---- src/components/UI/icons/index.ts | 1 - src/constants.ts | 25 +--------- src/pages/downloads.tsx | 47 ------------------- src/types.ts | 1 - src/utils/fetchXMLData.ts | 4 -- src/utils/getLatestBinaryURL.ts | 3 -- 9 files changed, 11 insertions(+), 102 deletions(-) delete mode 100644 src/components/UI/icons/MacosLogo.tsx diff --git a/src/components/UI/downloads/DownloadsHero.tsx b/src/components/UI/downloads/DownloadsHero.tsx index 7160e99297..7664b58343 100644 --- a/src/components/UI/downloads/DownloadsHero.tsx +++ b/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 = ({ 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; diff --git a/src/components/UI/downloads/DownloadsTable.tsx b/src/components/UI/downloads/DownloadsTable.tsx index 1924d32d19..f25d042e5a 100644 --- a/src/components/UI/downloads/DownloadsTable.tsx +++ b/src/components/UI/downloads/DownloadsTable.tsx @@ -1,4 +1,4 @@ -import { Stack, Tabs, TabList, Tab, Text, TabPanel, TabPanels } from '@chakra-ui/react'; +import { Link, Stack, Tabs, TabList, Tab, Text, TabPanel, TabPanels } from '@chakra-ui/react'; import { FC, useMemo } from 'react'; import { DataTable } from '../../UI'; @@ -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 = ({ linuxData, - macOSData, windowsData, iOSData, androidData, @@ -30,7 +28,6 @@ export const DownloadsTable: FC = ({ }) => { const totalReleases = [ linuxData.length, - macOSData.length, windowsData.length, iOSData.length, androidData.length @@ -41,7 +38,6 @@ export const DownloadsTable: FC = ({ const getDefaultIndex = useMemo(() => { 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 2; if (/iPhone/i.test(OS)) return 3; if (/Android/i.test(userAgent)) return 4; @@ -91,10 +87,15 @@ export const DownloadsTable: FC = ({ /> - + + + Mac users should get their builds from{' '} + + Homebrew + {' '} + or compile themselves. + + ', - '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 ', @@ -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'; diff --git a/src/pages/downloads.tsx b/src/pages/downloads.tsx index e4be82ee70..68a2bd88bf 100644 --- a/src/pages/downloads.tsx +++ b/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 = ({ 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 = ({ 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 = ({ data }) => { > = ({ data }) => { > { 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, diff --git a/src/utils/getLatestBinaryURL.ts b/src/utils/getLatestBinaryURL.ts index d9b3ec0952..e5cdcc76c3 100644 --- a/src/utils/getLatestBinaryURL.ts +++ b/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`; };