From 55afb4efafdaeccf55808e36dae914c9214afe22 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Sun, 4 Feb 2024 02:20:48 -0500 Subject: [PATCH] ci: remove unnecessary targets --- .github/workflows/build.yml | 30 ------------------------------ cli/npm/install.js | 11 ----------- cli/src/tests/parser_test.rs | 4 ---- 3 files changed, 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f82f75fd..5da96012 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,19 +35,9 @@ jobs: platform: - linux-arm64 # - linux-arm # - - linux-armhf # - - linux-armv5te # - - linux-armv7l # - linux-x64 # - linux-x86 # - - linux-i586 # - - linux-powerpc # - linux-powerpc64 # - - linux-powerpc64el # - # - linux-riscv64gc # #2712 - - linux-s390x # - - linux-sparc64 # - - linux-thumbv7neon # - windows-arm64 # - windows-x64 # <-- No C library build - requires an additional adapted Makefile for `cl.exe` compiler - windows-x86 # -- // -- @@ -60,19 +50,9 @@ jobs: # 2. Add a new record to a matrix map in `cli/npm/install.js` - { platform: linux-arm64 , target: aarch64-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - { platform: linux-arm , target: arm-unknown-linux-gnueabi , os: ubuntu-latest , use-cross: true } - - { platform: linux-armhf , target: arm-unknown-linux-gnueabihf , os: ubuntu-latest , use-cross: true } - - { platform: linux-armv5te , target: armv5te-unknown-linux-gnueabi , os: ubuntu-latest , use-cross: true } - - { platform: linux-armv7l , target: armv7-unknown-linux-gnueabihf , os: ubuntu-latest , use-cross: true } - { platform: linux-x64 , target: x86_64-unknown-linux-gnu , os: ubuntu-20.04 , enable-wasm: true } #2272 - { platform: linux-x86 , target: i686-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - - { platform: linux-i586 , target: i586-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - - { platform: linux-powerpc , target: powerpc-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - { platform: linux-powerpc64 , target: powerpc64-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - - { platform: linux-powerpc64el , target: powerpc64le-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - # - { platform: linux-riscv64gc , target: riscv64gc-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } #2712 - - { platform: linux-s390x , target: s390x-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - - { platform: linux-sparc64 , target: sparc64-unknown-linux-gnu , os: ubuntu-latest , use-cross: true } - - { platform: linux-thumbv7neon , target: thumbv7neon-unknown-linux-gnueabihf , os: ubuntu-latest , use-cross: true } - { platform: windows-arm64 , target: aarch64-pc-windows-msvc , os: windows-latest } - { platform: windows-x64 , target: x86_64-pc-windows-msvc , os: windows-latest , enable-wasm: true } - { platform: windows-x86 , target: i686-pc-windows-msvc , os: windows-latest } @@ -82,18 +62,8 @@ jobs: # Cross compilers for C library - { platform: linux-arm64 , cc: aarch64-linux-gnu-gcc , ar: aarch64-linux-gnu-ar } - { platform: linux-arm , cc: arm-linux-gnueabi-gcc , ar: arm-linux-gnueabi-ar } - - { platform: linux-armhf , cc: arm-unknown-linux-gnueabihf-gcc , ar: arm-unknown-linux-gnueabihf-ar } - - { platform: linux-armv5te , cc: arm-linux-gnueabi-gcc , ar: arm-linux-gnueabi-ar } - - { platform: linux-armv7l , cc: arm-linux-gnueabihf-gcc , ar: arm-linux-gnueabihf-ar } - { platform: linux-x86 , cc: i686-linux-gnu-gcc , ar: i686-linux-gnu-ar } - - { platform: linux-i586 , cc: i686-linux-gnu-gcc , ar: i686-linux-gnu-ar } - - { platform: linux-powerpc , cc: powerpc-linux-gnu-gcc , ar: powerpc-linux-gnu-ar } - { platform: linux-powerpc64 , cc: powerpc64-linux-gnu-gcc , ar: powerpc64-linux-gnu-ar } - - { platform: linux-powerpc64el , cc: powerpc64le-linux-gnu-gcc , ar: powerpc64le-linux-gnu-ar } - # - { platform: linux-riscv64gc , cc: riscv64-linux-gnu-gcc , ar: riscv64-linux-gnu-ar } #2712 - - { platform: linux-s390x , cc: s390x-linux-gnu-gcc , ar: s390x-linux-gnu-ar } - - { platform: linux-sparc64 , cc: sparc64-linux-gnu-gcc , ar: sparc64-linux-gnu-ar } - - { platform: linux-thumbv7neon , cc: arm-linux-gnueabihf-gcc , ar: arm-linux-gnueabihf-ar } # See #2041 tree-sitter issue - { platform: windows-x64 , rust-test-threads: 1 } diff --git a/cli/npm/install.js b/cli/npm/install.js index b2db3d7d..76b61648 100755 --- a/cli/npm/install.js +++ b/cli/npm/install.js @@ -21,20 +21,9 @@ const matrix = { arch: { 'arm64': { name: 'arm64' }, 'arm': { name: 'arm' }, - 'armv7l': { name: 'armv7l' }, 'x64': { name: 'x64' }, 'x86': { name: 'x86' }, - 'i586': { name: 'i586' }, - 'mips': { name: 'mips' }, - 'mips64': { name: 'mips64' }, - 'mipsel': { name: 'mipsel' }, - 'mips64el': { name: 'mips64el' }, - 'ppc': { name: 'powerpc' }, 'ppc64': { name: 'powerpc64' }, - 'ppc64el': { name: 'powerpc64el' }, - 'riscv64gc': { name: 'riscv64gc' }, - 's390x': { name: 's390x' }, - 'sparc64': { name: 'sparc64' }, } }, 'win32': { diff --git a/cli/src/tests/parser_test.rs b/cli/src/tests/parser_test.rs index 511ef02a..33a5a757 100644 --- a/cli/src/tests/parser_test.rs +++ b/cli/src/tests/parser_test.rs @@ -665,12 +665,8 @@ fn test_parsing_with_a_timeout() { None, ); assert!(tree.is_none()); - #[cfg(not(target_arch = "sparc64"))] assert!(start_time.elapsed().as_micros() < 2000); - #[cfg(target_arch = "sparc64")] - assert!(start_time.elapsed().as_micros() < 8000); - // Continue parsing, but pause after 1 ms of processing. parser.set_timeout_micros(5000); let start_time = time::Instant::now();