From 40a1bd09bfd6fe5aa1d913d812153d6e097ac0c5 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Thu, 22 Dec 2022 09:24:30 +0000 Subject: [PATCH] tailscale - force go from debian --- metadata/com.tailscale.ipn.yml | 44 +++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml index b235b37838..c9ba8a00c7 100644 --- a/metadata/com.tailscale.ipn.yml +++ b/metadata/com.tailscale.ipn.yml @@ -373,6 +373,7 @@ Builds: - versionName: 1.12.1-1d7592eb117-g1fc94ccf979 versionCode: 54 + disable: toolchain bypassed commit: f6227b38a61988bbe7f06c6eae27a263a4b2b568 subdir: android sudo: @@ -394,6 +395,7 @@ Builds: - versionName: 1.13.6-f414a9cc01f-gf59e53e41d8 versionCode: 55 + disable: toolchain bypassed commit: 7f086ccaa64f403a47bf8f8c8bcbb7f8d4d7ec2e subdir: android sudo: @@ -415,6 +417,7 @@ Builds: - versionName: 1.13.19-td37451bac-g82b6b8dbd36 versionCode: 57 + disable: toolchain bypassed commit: 3575ef712abdeda6a708b595c864d6ccaef3a260 subdir: android sudo: @@ -436,6 +439,7 @@ Builds: - versionName: 1.13.53-t8bdf87883-g30324736c98 versionCode: 60 + disable: toolchain bypassed commit: 9283506c04aefb7f93c27444941496d5fd686cef subdir: android sudo: @@ -453,6 +457,7 @@ Builds: - versionName: 1.15.196-t173bbaa1a-g0637d599af4 versionCode: 67 + disable: toolchain bypassed commit: ef96ee30fd71fbf1911962a1ddb838a75d2485ae subdir: android sudo: @@ -470,6 +475,7 @@ Builds: - versionName: 1.15.210-tbabd163aa-g9b52c6b357b versionCode: 69 + disable: toolchain bypassed commit: 65185350399b3a10eb1854dc5e991f6a14bd8c16 subdir: android sudo: @@ -487,6 +493,7 @@ Builds: - versionName: 1.16.0-tb0f4f3161-g2840d54aade versionCode: 70 + disable: toolchain bypassed commit: 9415b5513361835b2d2d2963382e2aaaa6e15a14 subdir: android sudo: @@ -504,6 +511,7 @@ Builds: - versionName: 1.17.52-t9af27ba82-g82ea8df1dc8 versionCode: 71 + disable: toolchain bypassed commit: a4a3ae6eff9e3434e2fcd0edc5c4f3d8d85b2292 subdir: android sudo: @@ -521,6 +529,7 @@ Builds: - versionName: 1.16.1-t4f4000fbe-g0e7d23df47d versionCode: 72 + disable: toolchain bypassed commit: d7e93b3f426764ddd60610cea9a0ff47553e2e31 subdir: android sudo: @@ -538,6 +547,7 @@ Builds: - versionName: 1.17.81-tc60806b55-g61f90a1975b versionCode: 73 + disable: toolchain bypassed commit: fe76bef85b8386f1c74edd831d701f312047eed2 subdir: android sudo: @@ -555,6 +565,7 @@ Builds: - versionName: 1.16.2-tb56ba2054-g377795b3b67 versionCode: 74 + disable: toolchain bypassed commit: 1d5a46d490ac612a83f3c9a5f73975a7bb1658f2 subdir: android sudo: @@ -572,6 +583,7 @@ Builds: - versionName: 1.18.0-t71f1dd5aa-g6e464cc68f9 versionCode: 78 + disable: toolchain bypassed commit: cbd98238f24f4a936e1a0487726515beed82c77d subdir: android sudo: @@ -589,6 +601,7 @@ Builds: - versionName: 1.18.2-tb04815c9c-g08e1f97a38e versionCode: 82 + disable: toolchain bypassed commit: 7e32eb74bbf1ca3fe6886f96d6bf967bea855bfd subdir: android sudo: @@ -606,6 +619,7 @@ Builds: - versionName: 1.19.190-tc5243562d-g14b849f0e85-dirty versionCode: 84 + disable: toolchain bypassed commit: 64192d4ae8aef9461ed68cd015958a9fb5464af0 subdir: android sudo: @@ -627,6 +641,7 @@ Builds: - versionName: 1.21.8-t8cf1af8a0-g6b83c6ae21f versionCode: 85 + disable: toolchain bypassed commit: df73d8a41945cf4b81402dab8806c14c2af622c3 subdir: android sudo: @@ -648,6 +663,7 @@ Builds: - versionName: 1.21.24-t0ada42684-g213009e9af5 versionCode: 86 + disable: toolchain bypassedv commit: aa5123b8b4621e821ee4c566cfe1a73531ef8891 subdir: android sudo: @@ -669,6 +685,7 @@ Builds: - versionName: 1.20.2-t8e643357d-ge1751fa2802 versionCode: 87 + disable: toolchain bypassed commit: 539a1cf84ff081c243889351892d1d874a4b871c subdir: android sudo: @@ -690,6 +707,7 @@ Builds: - versionName: 1.21.112-td19a63ddf-g5868fdb7b04 versionCode: 89 + disable: toolchain bypassed commit: 69f2fe67dcce8b21a52c558de6a6169ff17668af subdir: android sudo: @@ -711,6 +729,7 @@ Builds: - versionName: 1.21.114-te921e1b02-g4a1c0cb2ee7 versionCode: 90 + disable: toolchain bypassed commit: 0e5c2ec1ec2cabc347d9805b2077b8a7b25efa17 subdir: android sudo: @@ -732,6 +751,7 @@ Builds: - versionName: 1.22.0-t4e0b00ad8-g56cf5b6132d versionCode: 91 + disable: toolchain bypassed commit: 79ecc5e59f3b7b3171110125563dd263bedcdcf8 subdir: android sudo: @@ -753,6 +773,7 @@ Builds: - versionName: 1.23.148-t7c7f37342-gb4f8e7f90a4 versionCode: 94 + disable: toolchain bypassed commit: d8ccc2387f1776cdd93b0af39cc95a5da716d99b subdir: android sudo: @@ -774,6 +795,7 @@ Builds: - versionName: 1.23.210-tc13be0c50-g3f8df48d23d versionCode: 97 + disable: toolchain bypassed commit: e652d853d6aa574c9a3f277695cd286c2b32a088 subdir: android sudo: @@ -795,6 +817,7 @@ Builds: - versionName: 1.23.238-t695f8a1d7-gbd5ef3fd68d versionCode: 100 + disable: toolchain bypassed commit: 40481f5ec63b921590549b9b7a91d133627a8f41 subdir: android sudo: @@ -816,6 +839,7 @@ Builds: - versionName: 1.24.0-tf0e71f4a2-g772e6ae6f06 versionCode: 101 + disable: toolchain bypassed commit: 289e5293c6e6c50d7a7ee7ea9a5ba7c33d7bc6e8 subdir: android sudo: @@ -837,6 +861,7 @@ Builds: - versionName: 1.25.35-te3619b890-ge66e57fbb08 versionCode: 103 + disable: toolchain bypassed commit: 536c17a3a21fbcd7143ed1fade85375976f05ea1 subdir: android sudo: @@ -858,6 +883,7 @@ Builds: - versionName: 1.25.91-tfc5839864-g1845f173179 versionCode: 104 + disable: toolchain bypassed commit: 9de8d8e525f24737641a4eba28ff9ff050123b1e subdir: android sudo: @@ -879,6 +905,7 @@ Builds: - versionName: 1.27.24-t467eb2eca-g0c11377ca10 versionCode: 107 + disable: toolchain bypassed commit: 221300266f23047e9b83e24d9c51f93769ed2b95 subdir: android sudo: @@ -900,6 +927,7 @@ Builds: - versionName: 1.27.57-t06aa14163-g4fa037b636b versionCode: 108 + disable: toolchain bypassed commit: 8ddaf1ec5ca7120066f9c31166a09736eeb109b8 subdir: android sudo: @@ -921,6 +949,7 @@ Builds: - versionName: 1.26.2-t5a60f1ffe-g4b32a50bc96 versionCode: 111 + disable: toolchain bypassed commit: 0d984ec8856fdce7319ad8663d8a542f4f6e88c6 subdir: android sudo: @@ -942,6 +971,7 @@ Builds: - versionName: 1.29.0-t3c892d106-g42f688f1292 versionCode: 114 + disable: toolchain bypassed commit: db31496a243c042e4fdb22750cf87a04fd22ac32 subdir: android sudo: @@ -963,6 +993,7 @@ Builds: - versionName: 1.29.72-tb905db7a5-g9e6ef85d269 versionCode: 117 + disable: toolchain bypassed commit: aafa3432dcadb1381a912c942f214f36e41b9760 subdir: android sudo: @@ -984,6 +1015,7 @@ Builds: - versionName: 1.29.194-t70f9fc8c7-gd0812b9476b versionCode: 121 + disable: toolchain bypassed commit: c0f9eed38e0b6ef18b0088cf0d751834f1b1f8a2 subdir: android sudo: @@ -1005,6 +1037,7 @@ Builds: - versionName: 1.31.40-t2aade349f-g033f7d87b43 versionCode: 125 + disable: toolchain bypassed commit: 4869bb4666c335db87d082db35dbbac7c2ffd7ff subdir: android sudo: @@ -1026,6 +1059,7 @@ Builds: - versionName: 1.33.20-t899b4cae1-g185cc3dd8f9 versionCode: 132 + disable: toolchain bypassed commit: f7c662ca4af22c27530e4eb86b4389b73f733fa7 subdir: android sudo: @@ -1040,6 +1074,7 @@ Builds: - versionName: 1.33.21-t63ad49890-g80dfbd8a0c5 versionCode: 133 + disable: toolchain bypassed commit: b6c2536147950a47b5e0184f9ecc5230dd1d65ce subdir: android sudo: @@ -1054,6 +1089,7 @@ Builds: - versionName: 1.32.2-t54e8fa172-gd9ef1cad8ab versionCode: 134 + disable: toolchain bypassed commit: 21b91f2f6dc10b607d3e7ed71c66b4e8a07be95a subdir: android sudo: @@ -1068,6 +1104,7 @@ Builds: - versionName: 1.33.97-t81fd25913-g26e72f15efe versionCode: 135 + disable: toolchain bypassed commit: bb147bf07cbc61b55794ded74c03a6e5a06f06df subdir: android sudo: @@ -1082,6 +1119,7 @@ Builds: - versionName: 1.33.299-t300aba61a-g1181155b7d1 versionCode: 139 + disable: toolchain bypassed commit: 498e73e3921fafdb9105ae665dd6286e184e3b53 subdir: android sudo: @@ -1096,6 +1134,7 @@ Builds: - versionName: 1.35.5-t4b34c8842-gc5e20b297c0 versionCode: 142 + disable: toolchain bypassed commit: 7f11150cb6a3df6a1c36125f187b6892024fe46f subdir: android sudo: @@ -1110,6 +1149,7 @@ Builds: - versionName: 1.34.1-t331d553a5-g14e42b2de7e versionCode: 143 + disable: toolchain bypassed commit: 50fc57881f4be0b333c04ced78fc2679ddf4fa7d subdir: android sudo: @@ -1132,7 +1172,9 @@ Builds: - apt-get install -y make gradle: - fdroid - prebuild: sdkmanager 'platforms;android-31' 'build-tools;31.0.0' + prebuild: + - sdkmanager 'platforms;android-31' 'build-tools;31.0.0' + - sed -i -e 's!$(TOOLCHAINDIR)/go/bin/!!' ../Makefile build: ANDROID_NDK_ROOT=$$NDK$$ make -C .. release_aar ndk: r23b