Revert using vcpkg in linux github runner

laggykiller · Sep 6, 2023 · bc1a44e · bc1a44e
1 parent 780273a
commit bc1a44e
Showing 1 changed file with 9 additions and 48 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -64,26 +64,15 @@ jobs:
             arch: x64
             submodules_mode: true
             cibw_archs_linux: x86_64
-            cibw_environment: >
-              VCPKG_INSTALLATION_ROOT=/vcpkg
-              APNGASM_COMPILE_TARGET=x64
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: x86
             submodules_mode: true
             cibw_archs_linux: i686
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=i686
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: arm64
             submodules_mode: true
@@ -92,11 +81,7 @@ jobs:
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=aarch64
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: arm64
             submodules_mode: true
@@ -105,11 +90,7 @@ jobs:
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=aarch64
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: arm64
             submodules_mode: true
@@ -118,11 +99,7 @@ jobs:
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=aarch64
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: ppc64le
             submodules_mode: true
@@ -131,11 +108,7 @@ jobs:
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=ppc64le
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: ppc64le
             submodules_mode: true
@@ -144,11 +117,7 @@ jobs:
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=ppc64le
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: s390x
             submodules_mode: true
@@ -157,11 +126,7 @@ jobs:
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=s390x
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
           - os: ubuntu-20.04
             arch: s390x
             submodules_mode: true
@@ -170,11 +135,7 @@ jobs:
             cibw_environment: >
               VCPKG_INSTALLATION_ROOT=/vcpkg
               APNGASM_COMPILE_TARGET=s390x
-            cibw_before_all: |
-              yum install tar curl zip unzip ninja-build -y
-              git clone https://github.com/microsoft/vcpkg.git /vcpkg
-              /vcpkg/bootstrap-vcpkg.sh
-              ./prepare-linux.sh
+            cibw_before_all: ./prepare-linux.sh
 
     steps:
       - uses: actions/checkout@v3