From 017ebb28deace74b092f5829b8d424c968bdf81c Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 31 Dec 2020 14:49:31 -0600 Subject: [PATCH 1/6] Add support for arm64 --- com.visualstudio.code.yaml | 12 ++++++++++++ flathub.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml index 77777de..4bba70f 100644 --- a/com.visualstudio.code.yaml +++ b/com.visualstudio.code.yaml @@ -98,3 +98,15 @@ modules: root: http://packages.microsoft.com/repos/vscode dist: stable component: main + - type: extra-data + filename: code.deb + only-arches: [aarch64] + url: https://packages.microsoft.com/repos/code/pool/main/c/code/code_1.52.1-1608136325_arm64.deb + sha256: af05fb9d7c9a86d6653fffc9fbe46c3d8b9be8195d85ae9529e9e5fd89bd2ddc + size: 64631738 + x-checker-data: + type: debian-repo + package-name: code + root: http://packages.microsoft.com/repos/vscode + dist: stable + component: main diff --git a/flathub.json b/flathub.json index aace8d2..a3da91f 100644 --- a/flathub.json +++ b/flathub.json @@ -1,4 +1,4 @@ { - "only-arches": ["x86_64"], + "only-arches": ["aarch64", "x86_64"], "automerge-flathubbot-prs": true } From 41de7e7451a47173abe4b8b3b860071099ac19e4 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 31 Dec 2020 15:27:15 -0600 Subject: [PATCH 2/6] Add 32-bit ARM --- com.visualstudio.code.yaml | 12 ++++++++++++ flathub.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml index 4bba70f..b2f03e5 100644 --- a/com.visualstudio.code.yaml +++ b/com.visualstudio.code.yaml @@ -98,6 +98,18 @@ modules: root: http://packages.microsoft.com/repos/vscode dist: stable component: main + - type: extra-data + filename: code.deb + only-arches: [arm] + url: https://packages.microsoft.com/repos/code/pool/main/c/code/code_1.52.1-1608136275_armhf.deb + sha256: 35fbc1e755e12c917686ccbb70bc52baef42eab07f2b22c83886b7979f9b3330 + size: 60667760 + x-checker-data: + type: debian-repo + package-name: code + root: http://packages.microsoft.com/repos/vscode + dist: stable + component: main - type: extra-data filename: code.deb only-arches: [aarch64] diff --git a/flathub.json b/flathub.json index a3da91f..6b191d1 100644 --- a/flathub.json +++ b/flathub.json @@ -1,4 +1,4 @@ { - "only-arches": ["aarch64", "x86_64"], + "only-arches": ["aarch64", "arm", "x86_64"], "automerge-flathubbot-prs": true } From a5f8131a084c18fc1559a403ec27ff15c8b681ee Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 31 Dec 2020 15:34:53 -0600 Subject: [PATCH 3/6] Fix x-checker-data URL for ARM --- com.visualstudio.code.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml index b2f03e5..879d13f 100644 --- a/com.visualstudio.code.yaml +++ b/com.visualstudio.code.yaml @@ -107,7 +107,7 @@ modules: x-checker-data: type: debian-repo package-name: code - root: http://packages.microsoft.com/repos/vscode + root: http://packages.microsoft.com/repos/code dist: stable component: main - type: extra-data @@ -119,6 +119,6 @@ modules: x-checker-data: type: debian-repo package-name: code - root: http://packages.microsoft.com/repos/vscode + root: http://packages.microsoft.com/repos/code dist: stable component: main From 25109bc8b41ac19c286dbbda67f238f2569f3bff Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 31 Dec 2020 15:38:32 -0600 Subject: [PATCH 4/6] Update amd64 URL for consistency The ARM packages are only available under the code URL, not VSCode. The amd64 package is also available here, so the URL has been updated. This keeps things consistent. --- com.visualstudio.code.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml index 879d13f..1d7c7d4 100644 --- a/com.visualstudio.code.yaml +++ b/com.visualstudio.code.yaml @@ -89,13 +89,13 @@ modules: - type: extra-data filename: code.deb only-arches: [x86_64] - url: http://packages.microsoft.com/repos/vscode/pool/main/c/code/code_1.52.1-1608136922_amd64.deb + url: https://packages.microsoft.com/repos/code/pool/main/c/code/code_1.52.1-1608136922_amd64.deb sha256: eccdcaa756fa58947fa046f3a0b3420e8b93c22fb1d50de76f5d8a313a3f5fa4 size: 64770102 x-checker-data: type: debian-repo package-name: code - root: http://packages.microsoft.com/repos/vscode + root: http://packages.microsoft.com/repos/code dist: stable component: main - type: extra-data From b1ea527b33abe6406ce3ebba97d458c7df5ae314 Mon Sep 17 00:00:00 2001 From: Nick Richards Date: Sat, 6 Feb 2021 22:24:56 +0000 Subject: [PATCH 5/6] only add aarch64 --- com.visualstudio.code.yaml | 26 +++++++------------------- flathub.json | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml index 1d7c7d4..aa2e67a 100644 --- a/com.visualstudio.code.yaml +++ b/com.visualstudio.code.yaml @@ -67,7 +67,7 @@ modules: - ar x code.deb - tar xf data.tar.xz - mv usr/share/code vscode - - rm -r code.deb control.tar.gz data.tar.xz debian-binary usr + - rm -r code.deb control.tar.xz data.tar.xz debian-binary usr - type: file path: code.sh - type: file @@ -89,21 +89,9 @@ modules: - type: extra-data filename: code.deb only-arches: [x86_64] - url: https://packages.microsoft.com/repos/code/pool/main/c/code/code_1.52.1-1608136922_amd64.deb - sha256: eccdcaa756fa58947fa046f3a0b3420e8b93c22fb1d50de76f5d8a313a3f5fa4 - size: 64770102 - x-checker-data: - type: debian-repo - package-name: code - root: http://packages.microsoft.com/repos/code - dist: stable - component: main - - type: extra-data - filename: code.deb - only-arches: [arm] - url: https://packages.microsoft.com/repos/code/pool/main/c/code/code_1.52.1-1608136275_armhf.deb - sha256: 35fbc1e755e12c917686ccbb70bc52baef42eab07f2b22c83886b7979f9b3330 - size: 60667760 + url: http://packages.microsoft.com/repos/vscode/pool/main/c/code/code_1.53.0-1612368357_amd64.deb + sha256: aceb855fca3ec903e873c1e5460e929434314af7f5d96a7a4e57ef4a34a45fda + size: 69074128 x-checker-data: type: debian-repo package-name: code @@ -113,9 +101,9 @@ modules: - type: extra-data filename: code.deb only-arches: [aarch64] - url: https://packages.microsoft.com/repos/code/pool/main/c/code/code_1.52.1-1608136325_arm64.deb - sha256: af05fb9d7c9a86d6653fffc9fbe46c3d8b9be8195d85ae9529e9e5fd89bd2ddc - size: 64631738 + url: https://packages.microsoft.com/repos/code/pool/main/c/code/code_1.53.0-1612367976_arm64.deb + sha256: 7b8c2bf354b6dc135cc1759c58326b811af99095f7fc78112146c663f2fd8cb9 + size: 68418146 x-checker-data: type: debian-repo package-name: code diff --git a/flathub.json b/flathub.json index 6b191d1..a3da91f 100644 --- a/flathub.json +++ b/flathub.json @@ -1,4 +1,4 @@ { - "only-arches": ["aarch64", "arm", "x86_64"], + "only-arches": ["aarch64", "x86_64"], "automerge-flathubbot-prs": true } From a96957a1d813777fd67853ba4d2aac57b63a6846 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Sat, 6 Feb 2021 18:39:20 -0600 Subject: [PATCH 6/6] Delete the control.tar file regardless of the compression format The arm64 build uses a gzip compressed control instead of xz. This causes an error when installing the arm64 Flatpak. This commit deletes the control using a wildcard for the extension. That way the file is deleted without an error whatever the format. --- com.visualstudio.code.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml index aa2e67a..1537324 100644 --- a/com.visualstudio.code.yaml +++ b/com.visualstudio.code.yaml @@ -67,7 +67,7 @@ modules: - ar x code.deb - tar xf data.tar.xz - mv usr/share/code vscode - - rm -r code.deb control.tar.xz data.tar.xz debian-binary usr + - rm -r code.deb control.tar.* data.tar.xz debian-binary usr - type: file path: code.sh - type: file