Drop 32-bit ARM support

myhro · Apr 18, 2023 · 108a20d · 108a20d
1 parent b751f70
commit 108a20d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 58 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,8 +14,6 @@ jobs:
             os: darwin
           - arch: amd64
             os: linux
-          - arch: arm
-            os: linux
           - arch: arm64
             os: linux
     steps:
@@ -55,7 +53,6 @@ jobs:
           files: |
             dist/staticd-darwin-amd64
             dist/staticd-linux-amd64
-            dist/staticd-linux-arm
             dist/staticd-linux-arm64
           prerelease: true
       - uses: softprops/action-gh-release@v1
@@ -64,5 +61,4 @@ jobs:
           files: |
             dist/staticd-darwin-amd64
             dist/staticd-linux-amd64
-            dist/staticd-linux-arm
             dist/staticd-linux-arm64
diff --git a/tables/arch.go b/tables/arch.go
@@ -7,7 +7,6 @@ var Arch = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "x86_64",
-			"arm":   "arm",
 			"arm64": "aarch64",
 		},
 	},
@@ -17,7 +16,6 @@ var Arch = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "x86_64",
-			"arm":   "armv7",
 			"arm64": "aarch64",
 		},
 	},
@@ -27,7 +25,6 @@ var Arch = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "amd64",
-			"arm":   "arm",
 			"arm64": "arm64",
 		},
 	},
@@ -47,14 +44,12 @@ var Arch = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "x86_64",
-			"arm":   "arm",
 			"arm64": "arm64",
 		},
 	},
 	UPX: {
 		"linux": {
 			"amd64": "amd64",
-			"arm":   "arm",
 			"arm64": "arm64",
 		},
 	},
@@ -64,7 +59,6 @@ var Arch = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "x86_64",
-			"arm":   "arm",
 			"arm64": "aarch64",
 		},
 	},
@@ -74,7 +68,6 @@ var Arch = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "",
-			"arm":   "arm-v7",
 			"arm64": "arm64",
 		},
 	},

diff --git a/tables/os.go b/tables/os.go
@@ -7,7 +7,6 @@ var OS = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "unknown-linux-gnu",
-			"arm":   "unknown-linux-gnueabihf",
 			"arm64": "unknown-linux-gnu",
 		},
 	},
@@ -17,7 +16,6 @@ var OS = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "unknown-linux-gnu",
-			"arm":   "unknown-linux-gnueabihf",
 			"arm64": "unknown-linux-gnu",
 		},
 	},
@@ -27,7 +25,6 @@ var OS = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "linux",
-			"arm":   "linux",
 			"arm64": "linux",
 		},
 	},
@@ -47,14 +44,12 @@ var OS = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "Linux",
-			"arm":   "Linux",
 			"arm64": "Linux",
 		},
 	},
 	UPX: {
 		"linux": {
 			"amd64": "linux",
-			"arm":   "linux",
 			"arm64": "linux",
 		},
 	},
@@ -64,7 +59,6 @@ var OS = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "unknown-linux-musl",
-			"arm":   "unknown-linux-gnueabihf",
 			"arm64": "unknown-linux-musl",
 		},
 	},
@@ -74,7 +68,6 @@ var OS = map[string]map[string]map[string]string{
 		},
 		"linux": {
 			"amd64": "linux",
-			"arm":   "linux",
 			"arm64": "linux",
 		},
 	},

diff --git a/tools/asset_test.go b/tools/asset_test.go
@@ -251,15 +251,6 @@ func (s *AssetTestSuite) TestName() {
 			os:   "linux",
 			name: "yj-linux",
 		},
-		{
-			tool: &Tool{
-				Name:    Yj,
-				Version: "v5.0.0",
-			},
-			arch: "arm",
-			os:   "linux",
-			name: "yj-linux-arm-v7",
-		},
 	}
 
 	for _, tt := range table {

diff --git a/tools/runtime_test.go b/tools/runtime_test.go
@@ -33,12 +33,6 @@ func (s *RuntimeTestSuite) TestBatRuntime() {
 			archOut: "x86_64",
 			osOut:   "apple-darwin",
 		},
-		{
-			arch:    "arm",
-			os:      "linux",
-			archOut: "arm",
-			osOut:   "unknown-linux-gnueabihf",
-		},
 	}
 
 	for _, tt := range table {
@@ -71,12 +65,6 @@ func (s *RuntimeTestSuite) TestBottomRuntime() {
 			archOut: "x86_64",
 			osOut:   "apple-darwin",
 		},
-		{
-			arch:    "arm",
-			os:      "linux",
-			archOut: "armv7",
-			osOut:   "unknown-linux-gnueabihf",
-		},
 	}
 
 	for _, tt := range table {
@@ -109,12 +97,6 @@ func (s *RuntimeTestSuite) TestCloudflaredRuntime() {
 			archOut: "amd64",
 			osOut:   "darwin",
 		},
-		{
-			arch:    "arm",
-			os:      "linux",
-			archOut: "arm",
-			osOut:   "linux",
-		},
 	}
 
 	for _, tt := range table {
@@ -132,7 +114,7 @@ func (s *RuntimeTestSuite) TestInvalidRuntime() {
 	t := &Tool{
 		Name: Bat,
 	}
-	err := t.SetRuntime("arm", "darwin")
+	err := t.SetRuntime("riscv", "darwin")
 	s.Error(err)
 }
 
@@ -199,12 +181,6 @@ func (s *RuntimeTestSuite) TestK9sRuntime() {
 			archOut: "x86_64",
 			osOut:   "Darwin",
 		},
-		{
-			arch:    "arm",
-			os:      "linux",
-			archOut: "arm",
-			osOut:   "Linux",
-		},
 	}
 
 	for _, tt := range table {
@@ -237,12 +213,6 @@ func (s *RuntimeTestSuite) TestXhRuntime() {
 			archOut: "x86_64",
 			osOut:   "apple-darwin",
 		},
-		{
-			arch:    "arm",
-			os:      "linux",
-			archOut: "arm",
-			osOut:   "unknown-linux-gnueabihf",
-		},
 	}
 
 	for _, tt := range table {