another attempt

livekit · Jun 19, 2024 · 7120e09 · 7120e09
1 parent 51b1ec1
commit 7120e09
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/publish-chrome.yaml b/.github/workflows/publish-chrome.yaml
@@ -29,38 +29,39 @@ jobs:
           chmod 600 ~/.ssh/linode_ed25519
           ssh-keyscan -H "${{ inputs.builder_ip }}" > ~/.ssh/known_hosts
 
-      - name: Setup
-        run: |
-          ssh -i ~/.ssh/linode_ed25519 \
-              -o PasswordAuthentication=no \
-              -t root@${{ inputs.builder_ip }} \
-              'bash -s' < ./build/chrome/scripts/setup.sh
+#      - name: Setup
+#        run: |
+#          ssh -i ~/.ssh/linode_ed25519 \
+#              -o PasswordAuthentication=no \
+#              -t root@${{ inputs.builder_ip }} \
+#              'bash -s' < ./build/chrome/scripts/setup.sh
+#
+#      - name: Amd64
+#        run: |
+#          ssh -i ~/.ssh/linode_ed25519 \
+#              -o PasswordAuthentication=no \
+#              -t chrome@${{ inputs.builder_ip }} \
+#              'bash -s ${{ inputs.chrome_version }}' < ./build/chrome/scripts/amd64.sh
 
-      - name: Amd64
+      - name: Arm64
         run: |
           ssh -i ~/.ssh/linode_ed25519 \
               -o PasswordAuthentication=no \
+              -o ServerAliveInterval=60 \
               -t chrome@${{ inputs.builder_ip }} \
-              'bash -s ${{ inputs.chrome_version }}' < ./build/chrome/scripts/amd64.sh
+              'bash -s ${{ inputs.chrome_version }}' < ./build/chrome/scripts/arm64.sh
 
-      - name: Arm64
+      - name: Download artifacts
         run: |
           ssh -i ~/.ssh/linode_ed25519 \
               -o PasswordAuthentication=no \
-              -o ServerAliveInterval=60 \
               -t chrome@${{ inputs.builder_ip }} \
-              'bash -s ${{ inputs.chrome_version }}' < ./build/chrome/scripts/arm64.sh
-
-#      - name: Download artifacts
-#        run: |
-#          ssh -i ~/.ssh/linode_ed25519 \
-#              -o PasswordAuthentication=no \
-#              -t chrome@${{ inputs.builder_ip }} \
-#              'zip -r output.zip ./output'
-#          scp -i ~/.ssh/linode_ed25519 \
-#              -o PasswordAuthentication=no \
-#              chrome@${{ inputs.builder_ip }}:/home/chrome/output.zip \
-#              ${{ github.workspace }}/build/chrome/output.zip
+              'zip -r output.zip ./output'
+          scp -i ~/.ssh/linode_ed25519 \
+              -o PasswordAuthentication=no \
+              chrome@${{ inputs.builder_ip }}:/home/chrome/output.zip \
+              ${{ github.workspace }}/build/chrome/output.zip
+          unzip ${{ github.workspace }}/build/chrome/output.zip -d ${{ github.workspace }}/build/chrome/output
 
 #      - name: Set up Docker Buildx
 #        uses: docker/setup-buildx-action@v3

diff --git a/build/chrome/Dockerfile b/build/chrome/Dockerfile
@@ -14,5 +14,10 @@
 
 FROM ubuntu:22.04
 
-COPY arm64/ /chrome-installer/arm64/
+RUN mkdir -p /chrome-installer
+RUN wget -N https://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip
+RUN unzip chromedriver_linux64.zip -d /chrome-installer/
+
+COPY output/arm64/ /chrome-installer/arm64/
+COPY output/amd64/ /chrome-installer/amd64/
 COPY install-chrome /chrome-installer/
diff --git a/build/chrome/install-chrome b/build/chrome/install-chrome
@@ -41,15 +41,9 @@ then
   chown root:root /usr/local/sbin/chrome-devel-sandbox
   chmod 4755 /usr/local/sbin/chrome-devel-sandbox
 else
-  wget https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_124.0.6367.201-1_amd64.deb
-  apt-get install -y ./google-chrome-stable_124.0.6367.201-1_amd64.deb
-  rm google-chrome-stable_124.0.6367.201-1_amd64.deb
+  apt-get install -y /chrome-installer/amd64/google-chrome-stable_124.0.6367.201-1_amd64.deb
 fi
 
-wget -N https://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip
-unzip chromedriver_linux64.zip
-chmod +x chromedriver
-mv -f chromedriver /usr/local/bin/chromedriver
-rm chromedriver_linux64.zip
-
+chmod +x /chrome-installer/chromedriver
+mv -f /chrome-installer/chromedriver /usr/local/bin/chromedriver
 rm -rf /chrome-installer
diff --git a/build/chrome/scripts/arm64.sh b/build/chrome/scripts/arm64.sh
@@ -28,6 +28,7 @@ echo 'solutions = [
   },
 ]' | tee '.gclient' > /dev/null
 cd src || exit
+git fetch --tags
 git checkout -b stable "$1"
 gclient sync -D --with_branch_heads --with_tags
 ./build/install-build-deps.sh