From f01e508ae79e83e81f738d5a9dcd1451d4eed2cd Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Mon, 4 Nov 2024 17:37:57 -0500 Subject: [PATCH 1/6] Add aarch64_ubuntu_22_04_android.json and x86_64_ubuntu_22_04_android.json --- nodes/aarch64_ubuntu_22_04_android.json | 18 ++++++++++++++++++ nodes/x86_64_ubuntu_22_04_android.json | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 nodes/aarch64_ubuntu_22_04_android.json create mode 100644 nodes/x86_64_ubuntu_22_04_android.json diff --git a/nodes/aarch64_ubuntu_22_04_android.json b/nodes/aarch64_ubuntu_22_04_android.json new file mode 100644 index 0000000..05d9345 --- /dev/null +++ b/nodes/aarch64_ubuntu_22_04_android.json @@ -0,0 +1,18 @@ +{ + "contact": { + "name": "Marc Prud'hommeaux", + "email": "swiftci@skip.tools", + "company": "Skip.tools" + }, + "node": { + "platform": "Android aarch64", + "os_version": "Ubuntu 22.04" + }, + "jobs": [ + { + "display_name": "Swift - Android (arm64) (Tools RA, Stdlib RD) (main)", + "branch": "main", + "preset": "buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,aarch64" + } + ] +} diff --git a/nodes/x86_64_ubuntu_22_04_android.json b/nodes/x86_64_ubuntu_22_04_android.json new file mode 100644 index 0000000..1bcdc04 --- /dev/null +++ b/nodes/x86_64_ubuntu_22_04_android.json @@ -0,0 +1,18 @@ +{ + "contact": { + "name": "Marc Prud'hommeaux", + "email": "swiftci@skip.tools", + "company": "Skip.tools" + }, + "node": { + "platform": "Android x86_64", + "os_version": "Ubuntu 22.04" + }, + "jobs": [ + { + "display_name": "Swift - Android (Tools RA, Stdlib RD) (main)", + "branch": "main", + "preset": "buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build" + } + ] +} From 2e1182889625fe55f538120b1578dad6882914e6 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Thu, 12 Dec 2024 08:23:12 -0500 Subject: [PATCH 2/6] Update preset for x86_64 --- nodes/x86_64_ubuntu_22_04_android.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/x86_64_ubuntu_22_04_android.json b/nodes/x86_64_ubuntu_22_04_android.json index 1bcdc04..80f028a 100644 --- a/nodes/x86_64_ubuntu_22_04_android.json +++ b/nodes/x86_64_ubuntu_22_04_android.json @@ -12,7 +12,7 @@ { "display_name": "Swift - Android (Tools RA, Stdlib RD) (main)", "branch": "main", - "preset": "buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build" + "preset": "buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,x86_64" } ] } From edcc8e368d7d7c9afeb3b0e71d837eb85749ae4c Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 21 Dec 2024 09:25:03 +0800 Subject: [PATCH 3/6] Update os_version to Ubuntu 24.04 --- nodes/aarch64_ubuntu_22_04_android.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/aarch64_ubuntu_22_04_android.json b/nodes/aarch64_ubuntu_22_04_android.json index 05d9345..e75f927 100644 --- a/nodes/aarch64_ubuntu_22_04_android.json +++ b/nodes/aarch64_ubuntu_22_04_android.json @@ -6,7 +6,7 @@ }, "node": { "platform": "Android aarch64", - "os_version": "Ubuntu 22.04" + "os_version": "Ubuntu 24.04" }, "jobs": [ { From c7c1865c88e52c4ac8dff386ea77a4cc4f931812 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 21 Dec 2024 09:25:20 +0800 Subject: [PATCH 4/6] Update os_version to Ubuntu 24.04 --- nodes/x86_64_ubuntu_22_04_android.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/x86_64_ubuntu_22_04_android.json b/nodes/x86_64_ubuntu_22_04_android.json index 80f028a..a79f986 100644 --- a/nodes/x86_64_ubuntu_22_04_android.json +++ b/nodes/x86_64_ubuntu_22_04_android.json @@ -6,7 +6,7 @@ }, "node": { "platform": "Android x86_64", - "os_version": "Ubuntu 22.04" + "os_version": "Ubuntu 24.04" }, "jobs": [ { From 180ea682ae198e8a8edecd41d282430bda795d66 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 21 Dec 2024 09:33:03 +0800 Subject: [PATCH 5/6] Rename aarch64_ubuntu_22_04_android.json to aarch64_ubuntu_24_04_android.json --- ...buntu_22_04_android.json => aarch64_ubuntu_24_04_android.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nodes/{aarch64_ubuntu_22_04_android.json => aarch64_ubuntu_24_04_android.json} (100%) diff --git a/nodes/aarch64_ubuntu_22_04_android.json b/nodes/aarch64_ubuntu_24_04_android.json similarity index 100% rename from nodes/aarch64_ubuntu_22_04_android.json rename to nodes/aarch64_ubuntu_24_04_android.json From 4a8c464054ec2bdab8ac53c2e59b041085eaa0a3 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 21 Dec 2024 09:33:16 +0800 Subject: [PATCH 6/6] Rename x86_64_ubuntu_22_04_android.json to x86_64_ubuntu_24_04_android.json --- ...ubuntu_22_04_android.json => x86_64_ubuntu_24_04_android.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nodes/{x86_64_ubuntu_22_04_android.json => x86_64_ubuntu_24_04_android.json} (100%) diff --git a/nodes/x86_64_ubuntu_22_04_android.json b/nodes/x86_64_ubuntu_24_04_android.json similarity index 100% rename from nodes/x86_64_ubuntu_22_04_android.json rename to nodes/x86_64_ubuntu_24_04_android.json