Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove support for arm64 going forward #315

Merged
merged 2 commits into from
Jan 7, 2020
Merged

Remove support for arm64 going forward #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10d549
remove arm64 tooling
outofambit Dec 17, 2019
c80c122
regenerate travis config
outofambit Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ matrix:
- GIT_FOR_WINDOWS_URL=https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-32-bit.zip
- GIT_FOR_WINDOWS_CHECKSUM=652c05175553e25401e38c7e65467d92748fc5d577374c9587c09f5875d8937e
- GIT_LFS_CHECKSUM=f4f49e9261584711c337f566a62bd9645cc0e10cef4dc54de1e1e0d31a7b2f71
- os: linux
language: c
env:
- TARGET_PLATFORM=arm64
- GIT_LFS_CHECKSUM=ea628d95158d5c76d9c7fe9432f28e49cc1a1b7ae3928b7089b1f4f97748d7a0
compiler:
- gcc
script:
Expand Down
6 changes: 0 additions & 6 deletions dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@
"name": "git-lfs-linux-amd64-v2.7.2.tar.gz",
"checksum": "89f5aa2c29800bbb71f5d4550edd69c5f83e3ee9e30f770446436dd7f4ef1d4c"
},
{
"platform": "linux",
"arch": "arm64",
"name": "git-lfs-linux-arm64-v2.7.2.tar.gz",
"checksum": "ea628d95158d5c76d9c7fe9432f28e49cc1a1b7ae3928b7089b1f4f97748d7a0"
},
{
"platform": "windows",
"arch": "x86",
Expand Down
31 changes: 0 additions & 31 deletions docker/arm64/Dockerfile
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions script/build-arm64-git.sh
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions script/build-arm64.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions script/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ elif [ "$TARGET_PLATFORM" == "macOS" ]; then
SCRIPT="$CURRENT_DIR/build-macos.sh"
elif [ "$TARGET_PLATFORM" == "win32" ]; then
SCRIPT="$CURRENT_DIR/build-win32.sh"
elif [ "$TARGET_PLATFORM" == "arm64" ]; then
SCRIPT="$CURRENT_DIR/build-arm64.sh"
else
echo "Unable to build Git for platform $TARGET_PLATFORM"
exit 1
Expand Down
19 changes: 5 additions & 14 deletions script/generate-travis-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,11 @@ function getConfig(platform: string, arch: string) {
}
}

if (platform === 'linux') {
if (arch === 'amd64') {
return {
os: 'linux',
language: 'c',
env: ['TARGET_PLATFORM=ubuntu', `GIT_LFS_CHECKSUM=${lfsFile.checksum}`],
}
} else if (arch === 'arm64') {
return {
os: 'linux',
language: 'c',
env: ['TARGET_PLATFORM=arm64', `GIT_LFS_CHECKSUM=${lfsFile.checksum}`],
}
if (platform === 'linux' && arch === 'amd64') {
return {
os: 'linux',
language: 'c',
env: ['TARGET_PLATFORM=ubuntu', `GIT_LFS_CHECKSUM=${lfsFile.checksum}`],
}
}

Expand Down Expand Up @@ -120,7 +112,6 @@ const baseConfig = {
getConfig('darwin', 'amd64'),
getConfig('windows', 'amd64'),
getConfig('windows', 'x86'),
getConfig('linux', 'arm64'),
],
},

Expand Down
3 changes: 0 additions & 3 deletions script/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ elif [ "$TARGET_PLATFORM" == "win32" ]; then
if [ "$WIN_ARCH" -eq "64" ]; then ARCH="x64"; else ARCH="x86"; fi
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.lzma"
elif [ "$TARGET_PLATFORM" == "arm64" ]; then
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.lzma"
else
echo "Unable to package Git for platform $TARGET_PLATFORM"
exit 1
Expand Down
4 changes: 0 additions & 4 deletions script/update-git-lfs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ function getArch(fileName: string) {
if (fileName.match(/-386-/)) {
return 'x86'
}
if (fileName.match(/-arm64-/)) {
return 'arm64'
}

throw new Error(`Unable to find arch for file: ${fileName}`)
}
Expand Down Expand Up @@ -97,7 +94,6 @@ async function run() {
const files = [
`git-lfs-darwin-amd64-${version}.tar.gz`,
`git-lfs-linux-amd64-${version}.tar.gz`,
`git-lfs-linux-arm64-${version}.tar.gz`,
`git-lfs-windows-386-${version}.zip`,
`git-lfs-windows-amd64-${version}.zip`,
]
Expand Down
3 changes: 0 additions & 3 deletions script/update-test-harness.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ elif [ "$TARGET_PLATFORM" == "win32" ]; then
if [ "$WIN_ARCH" -eq "64" ]; then ARCH="x64"; else ARCH="x86"; fi
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.lzma"
elif [ "$TARGET_PLATFORM" == "arm64" ]; then
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.lzma"
else
echo "Unable to package Git for platform $TARGET_PLATFORM"
exit 1
Expand Down
28 changes: 0 additions & 28 deletions script/verify-arm64-git.sh
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions test/macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ elif [ "$TARGET_PLATFORM" == "win32" ]; then
if [ "$WIN_ARCH" -eq "64" ]; then ARCH="x64"; else ARCH="x86"; fi
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.lzma"
elif [ "$TARGET_PLATFORM" == "arm64" ]; then
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.lzma"
else
echo "Unable to package Git for platform $TARGET_PLATFORM"
exit 1
Expand Down
3 changes: 0 additions & 3 deletions test/ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ elif [ "$TARGET_PLATFORM" == "win32" ]; then
if [ "$WIN_ARCH" -eq "64" ]; then ARCH="x64"; else ARCH="x86"; fi
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.lzma"
elif [ "$TARGET_PLATFORM" == "arm64" ]; then
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.lzma"
else
echo "Unable to package Git for platform $TARGET_PLATFORM"
exit 1
Expand Down
3 changes: 0 additions & 3 deletions test/win32.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ elif [ "$TARGET_PLATFORM" == "win32" ]; then
if [ "$WIN_ARCH" -eq "64" ]; then ARCH="x64"; else ARCH="x86"; fi
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-windows-$ARCH.lzma"
elif [ "$TARGET_PLATFORM" == "arm64" ]; then
GZIP_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.tar.gz"
LZMA_FILE="dugite-native-$VERSION-$BUILD_HASH-arm64.lzma"
else
echo "Unable to package Git for platform $TARGET_PLATFORM"
exit 1
Expand Down