Make Xvfb a layer

source-academy · Aug 17, 2020 · 5250fc3 · 5250fc3
1 parent f30e10f
commit 5250fc3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 49 deletions.
diff --git a/.github/workflows/build-lambda.yml → .github/workflows/build-grader.yml b/.github/workflows/build-lambda.yml → .github/workflows/build-grader.yml
@@ -33,41 +33,6 @@ jobs:
           name: build-lambda
       - name: Rebuild native modules
         run: scripts/build-lambda-grader-in-docker.sh
-      - uses: actions/upload-artifact@v2
-        with:
-          name: build-lambda
-          path: build.tar.bz2
-          if-no-files-found: error
-  xvfb:
-    name: Build Xvfb
-    runs-on: ubuntu-latest
-    container: lambci/lambda:build-nodejs12.x
-    steps:
-      - uses: actions/checkout@master
-      - name: Build Xvfb
-        run: scripts/build-lambda-xvfb.sh
-      - uses: actions/upload-artifact@v2
-        with:
-          name: xvfb
-          path: /var/task/xvfb.tar.bz2
-          if-no-files-found: error
-  combine:
-    name: Combine artifacts
-    needs: [xvfb, native]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-lambda
-      - uses: actions/download-artifact@v2
-        with:
-          name: xvfb
-      - name: Combine results
-        run: |
-          tar jxf build.tar.bz2
-          cd build
-          tar jxf ../xvfb.tar.bz2
-          zip -r ../grader.zip *
       - uses: actions/upload-artifact@v2
         with:
           name: graderzip
@@ -76,6 +41,4 @@ jobs:
       - uses: geekyeggo/delete-artifact@v1
         with:
           failOnError: false
-          name: |
-            build-lambda
-            xvfb
+          name: build-lambda
diff --git a/.github/workflows/build-xvfb-layer.yml b/.github/workflows/build-xvfb-layer.yml
@@ -0,0 +1,17 @@
+name: Build layer
+on: workflow_dispatch
+
+jobs:
+  xvfb:
+    name: Build Xvfb
+    runs-on: ubuntu-latest
+    container: lambci/lambda:build-nodejs12.x
+    steps:
+      - uses: actions/checkout@master
+      - name: Build Xvfb
+        run: scripts/build-lambda-xvfb.sh
+      - uses: actions/upload-artifact@v2
+        with:
+          name: xvfbzip
+          path: /opt/xvfb.zip
+          if-no-files-found: error
diff --git a/scripts/build-lambda-grader-in-docker.sh b/scripts/build-lambda-grader-in-docker.sh
@@ -26,7 +26,4 @@ for lib in $NEEDED_LIBS; do
   fi
 done
 
-cd ..
-
-rm build.tar.bz2
-tar jcf build.tar.bz2 build
+zip -r ../grader.zip *
diff --git a/scripts/build-lambda-xvfb.sh b/scripts/build-lambda-xvfb.sh
@@ -35,25 +35,25 @@ tar jxf "xkeyboard-config-$XKEYBOARD_CONFIG_VER.tar.bz2"
 tar jxf "xorg-server-$XORG_VER.tar.bz2"
 tar jxf "xkbcomp-$XKBCOMP_VER.tar.bz2"
 
-export LD_LIBRARY_PATH=/var/task
-export PKG_CONFIG_PATH=/var/task/share/pkgconfig:/var/task/lib/pkgconfig
+export LD_LIBRARY_PATH=/opt/lib
+export PKG_CONFIG_PATH=/opt/share/pkgconfig:/opt/lib/pkgconfig
 
 pushd "xkeyboard-config-$XKEYBOARD_CONFIG_VER"
-./configure --prefix=/var/task
+./configure --prefix=/opt
 make -j$(nproc) && make install
 popd
 
 pushd "xorg-server-$XORG_VER"
-./configure --prefix=/var/task --with-xkb-bin-directory=/tmp
+./configure --prefix=/opt --with-xkb-bin-directory=/tmp
 make -j$(nproc) && make install
 popd
 
 pushd "xkbcomp-$XKBCOMP_VER"
-./configure --prefix=/var/task
+./configure --prefix=/opt
 make -j$(nproc) && make install
 popd
 
-cd /var/task
+cd /opt
 
 strip bin/*
 find -name '*.so' -type f -print0 | xargs -0 strip
@@ -70,4 +70,4 @@ for lib in $(ldd $BINS_TO_LDD | grep -oP '^\s+\S+\s=>\s\K/(usr/)?lib\S+'); do
   fi
 done
 
-tar jcf xvfb.tar.bz2 *
+zip -r xvfb.zip *