From 651c307b6bb15951fe3586513662bdbc621087ee Mon Sep 17 00:00:00 2001
From: Riey <creeper844@gmail.com>
Date: Mon, 15 Feb 2021 13:28:24 +0900
Subject: [PATCH] Disable arch docker build

Due to https://github.com/actions/virtual-environments/issues/2658
---
 .github/workflows/release.yaml | 66 +++++++++++++++++++++-------------
 build-docker/arch/Dockerfile   |  9 -----
 ci/build_deb.sh                |  2 +-
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 086e1485..6306ad64 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,23 +9,24 @@ env:
   DOCKER_BUILDKIT: 1
 
 jobs:
-  build-arch:
-    runs-on: ubuntu-20.04
+  # Disable until https://github.com/actions/virtual-environments/issues/2658 fixed
+  # build-arch:
+  #   runs-on: ubuntu-20.04
 
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run docker
-        run: |
-          docker build --file build-docker/arch/Dockerfile --tag riey/kime-build:arch .
-          docker run --name kime-arch riey/kime-build:arch
-          mkdir /tmp/out
-          docker cp kime-arch:/opt/kime-out/kime.tar.xz /tmp/out/
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Run docker
+  #       run: |
+  #         docker build --file build-docker/arch/Dockerfile --tag riey/kime-build:arch .
+  #         docker run --name kime-arch riey/kime-build:arch
+  #         mkdir /tmp/out
+  #         docker cp kime-arch:/opt/kime-out/kime.tar.xz /tmp/out/
 
-      - name: Upload tar.xz
-        uses: actions/upload-artifact@v2
-        with:
-          name: arch
-          path: /tmp/out/kime.tar.xz
+  #     - name: Upload tar.xz
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: arch
+  #         path: /tmp/out/kime.tar.xz
   
   # ubuntu build is run on native
   build-ubuntu:
@@ -42,15 +43,16 @@ jobs:
           mkdir -pv /opt/kime-out
           ci/build_deb.sh
 
-      - name: Upload deb
+      - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ubuntu
-          path: /opt/kime-out/kime_amd64.deb
+          path: /opt/kime-out/*
 
   upload:
     needs:
-      - build-arch
+      # Disable until https://github.com/actions/virtual-environments/issues/2658 fixed
+      # - build-arch
       - build-ubuntu
 
     runs-on: ubuntu-20.04
@@ -58,14 +60,17 @@ jobs:
     steps:
       - name: Checkout workdir
         run: mkdir /tmp/work && cd /tmp/work
-      - name: Download arch artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: arch
+      # Disable until https://github.com/actions/virtual-environments/issues/2658 fixed
+      # - name: Download arch artifact
+      #   uses: actions/download-artifact@v2
+      #   with:
+      #     name: arch
+      #     path: arch
       - name: Download ubuntu artifact
         uses: actions/download-artifact@v2
         with:
           name: ubuntu
+          path: ubuntu
       - name: Create draft release
         id: create_release
         uses: actions/create-release@v1
@@ -77,14 +82,25 @@ jobs:
           draft: true
           prerelease: false
 
+      # Disable until https://github.com/actions/virtual-environments/issues/2658 fixed
+      # - name: Upload archive
+      #   uses: actions/upload-release-asset@v1
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+      #     asset_path: ./kime.tar.xz
+      #     asset_name: kime-arch-${{ github.ref }}.tar.xz
+      #     asset_content_type: application/x-xz
+
       - name: Upload archive
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./kime.tar.xz
-          asset_name: kime-${{ github.ref }}.tar.xz
+          asset_path: ./ubuntu/kime.tar.xz
+          asset_name: kime-ubuntu-${{ github.ref }}.tar.xz
           asset_content_type: application/x-xz
 
       - name: Upload deb package
@@ -93,6 +109,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./kime_amd64.deb
+          asset_path: ./ubuntu/kime_amd64.deb
           asset_name: kime_${{ github.ref }}_amd64.deb
           asset_content_type: application/x-xz
diff --git a/build-docker/arch/Dockerfile b/build-docker/arch/Dockerfile
index 76e41145..afa1875e 100644
--- a/build-docker/arch/Dockerfile
+++ b/build-docker/arch/Dockerfile
@@ -2,15 +2,6 @@ FROM archlinux:base-devel
 
 WORKDIR /opt/kime
 
-# WORKAROUND for glibc 2.33 and old Docker
-# See https://github.com/actions/virtual-environments/issues/2658
-# Thanks to https://github.com/lxqt/lxqt-panel/pull/1562
-RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
-    curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
-    bsdtar -C / -xvf "$patched_glibc"
-
-RUN mkdir -pv /var/lib/pacman
-
 RUN pacman -Syu --noconfirm
 RUN pacman -S --noconfirm --needed rust cmake clang llvm libxcb cairo
 RUN pacman -S --noconfirm --needed gtk2 gtk3 gtk4
diff --git a/ci/build_deb.sh b/ci/build_deb.sh
index 6cbdf577..220d966f 100755
--- a/ci/build_deb.sh
+++ b/ci/build_deb.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-scripts/build.sh -ar
+ci/build_xz.sh
 scripts/release-deb.sh /opt/kime-out