From e63891c79bab9509caa2730c7130ebde5b572723 Mon Sep 17 00:00:00 2001
From: Dilum Aluthge <dilum@aluthge.com>
Date: Wed, 19 Oct 2022 00:01:04 -0400
Subject: [PATCH] Add the `xvfb` rootfs image (#236)

* Add the `xvfb` rootfs image

* Alphabetize the list of rootfs images
---
 .github/workflows/linux.yml | 34 +++++++++++++++++++---------------
 linux/xvfb.jl               | 17 +++++++++++++++++
 2 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 linux/xvfb.jl

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3b2ef3b..37e7aa3 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -42,6 +42,11 @@ jobs:
           - 'agent_linux.x86_64'
           - 'agent_linux.i686'
 
+          # The `aws_uploader` image is a `debian`-based image that
+          # contains just `awscli`, for usage in secured pipelines
+          # that need to upload to AWS.
+          - 'aws_uploader.x86_64'
+
           # The `debian_minimal` image is a `debian`-based image that
           # contains no packages.
           - 'debian_minimal.aarch64'
@@ -50,10 +55,14 @@ jobs:
           - 'debian_minimal.x86_64'
           - 'debian_minimal.i686'
 
-          # The `aws_uploader` image is a `debian`-based image that
-          # contains just `awscli`, for usage in secured pipelines
-          # that need to upload to AWS.
-          - 'aws_uploader.x86_64'
+          # The `latex` image is used to build the PDF docs
+          - 'latex.x86_64'
+
+          # The `llvm_passes` image is a short-term solution for the `analyzegc` builder.
+          - 'llvm_passes.x86_64'
+
+          # The `npm_linux` image is a helper for ecosystem jobs that need to build NPM packages
+          - 'npm_linux.x86_64'
 
           # The `package_linux` images are all `debian`-based.
           - 'package_linux.aarch64'
@@ -65,6 +74,9 @@ jobs:
           # The `package_musl` image is `alpine`-based.
           - 'package_musl.x86_64'
 
+          # The `pkgserver_logsync` image is a helper for https://github.com/JuliaPackaging/PkgServerLogAnalysis.jl
+          - 'pkgserver_logsync.x86_64'
+
           # The `rr` image is `debian`-based.
           # It is used for building rr from source and running the rr test suite.
           - 'rr.aarch64'
@@ -82,17 +94,9 @@ jobs:
           # It does not include the compiler toolchain.
           - 'tester_musl.x86_64'
 
-          # The `llvm_passes` image is a short-term solution for the `analyzegc` builder.
-          - 'llvm_passes.x86_64'
-
-          # The `pkgserver_logsync` image is a helper for https://github.com/JuliaPackaging/PkgServerLogAnalysis.jl
-          - 'pkgserver_logsync.x86_64'
-
-          # The `npm_linux` image is a helper for ecosystem jobs that need to build NPM packages
-          - 'npm_linux.x86_64'
-
-          # The `latex` image is used to build the PDF docs
-          - 'latex.x86_64'
+          # The `xvfb` image is used in the CI for the PkgEval.jl repo
+          - 'xvfb.aarch64'
+          - 'xvfb.x86_64'
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
diff --git a/linux/xvfb.jl b/linux/xvfb.jl
new file mode 100644
index 0000000..e824443
--- /dev/null
+++ b/linux/xvfb.jl
@@ -0,0 +1,17 @@
+using RootfsUtils: parse_build_args, upload_gha, test_sandbox
+using RootfsUtils: debootstrap
+
+args         = parse_build_args(ARGS, @__FILE__)
+arch         = args.arch
+archive      = args.archive
+image        = args.image
+
+packages = [
+    "xvfb",
+    "locales",
+    "localepurge",
+]
+
+artifact_hash, tarball_path, = debootstrap(arch, image; archive, packages)
+upload_gha(tarball_path)
+test_sandbox(artifact_hash)