Use preconfigured bootstraps in the workflows

Kron4ek · Jul 19, 2023 · f635ab4 · f635ab4
1 parent 9f85421
commit f635ab4
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 15 deletions.
diff --git a/.github/workflows/proton-exp.yml b/.github/workflows/proton-exp.yml
@@ -11,13 +11,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bootstraps.yml
+          workflow_conclusion: success
+          path: /opt
       - name: Build Proton
         run: |
           sudo apt update
           sudo apt install debootstrap perl git wget xz-utils bubblewrap autoconf
-          chmod +x create_ubuntu_bootstraps.sh build_wine.sh
-          sudo ./create_ubuntu_bootstraps.sh
+          sudo tar -C /opt -xpf /opt/Bootstraps/bootstraps.tar.xz
+          chmod +x build_wine.sh
           WINE_BRANCH=proton PROTON_BRANCH=experimental_8.0 ./build_wine.sh
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/proton.yml b/.github/workflows/proton.yml
@@ -11,13 +11,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bootstraps.yml
+          workflow_conclusion: success
+          path: /opt
       - name: Build Proton
         run: |
           sudo apt update
           sudo apt install debootstrap perl git wget xz-utils bubblewrap autoconf
-          chmod +x create_ubuntu_bootstraps.sh build_wine.sh
-          sudo ./create_ubuntu_bootstraps.sh
+          sudo tar -C /opt -xpf /opt/Bootstraps/bootstraps.tar.xz
+          chmod +x build_wine.sh
           WINE_BRANCH=proton ./build_wine.sh
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/wine-exp-wow64.yml b/.github/workflows/wine-exp-wow64.yml
@@ -11,13 +11,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bootstraps.yml
+          workflow_conclusion: success
+          path: /opt
       - name: Build Wine
         run: |
           sudo apt update
           sudo apt install debootstrap perl git wget xz-utils bubblewrap autoconf
-          chmod +x create_ubuntu_bootstraps.sh build_wine.sh
-          sudo ./create_ubuntu_bootstraps.sh
+          sudo tar -C /opt -xpf /opt/Bootstraps/bootstraps.tar.xz
+          chmod +x build_wine.sh
           export WINE_VERSION="latest"
           export EXPERIMENTAL_WOW64="true"
           WINE_BRANCH=vanilla ./build_wine.sh

diff --git a/.github/workflows/wine-git.yml b/.github/workflows/wine-git.yml
@@ -11,13 +11,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bootstraps.yml
+          workflow_conclusion: success
+          path: /opt
       - name: Build Wine
         run: |
           sudo apt update
           sudo apt install debootstrap perl git wget xz-utils bubblewrap autoconf
-          chmod +x create_ubuntu_bootstraps.sh build_wine.sh
-          sudo ./create_ubuntu_bootstraps.sh
+          sudo tar -C /opt -xpf /opt/Bootstraps/bootstraps.tar.xz
+          chmod +x build_wine.sh
           export WINE_VERSION="git"
           WINE_BRANCH=vanilla ./build_wine.sh
           WINE_BRANCH=staging ./build_wine.sh

diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
@@ -9,13 +9,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bootstraps.yml
+          workflow_conclusion: success
+          path: /opt
       - name: Build Wine
         run: |
           sudo apt update
           sudo apt install debootstrap perl git wget xz-utils bubblewrap autoconf
-          chmod +x create_ubuntu_bootstraps.sh build_wine.sh
-          sudo ./create_ubuntu_bootstraps.sh
+          sudo tar -C /opt -xpf /opt/Bootstraps/bootstraps.tar.xz
+          chmod +x build_wine.sh
           export WINE_VERSION="$(wget -q -O - "https://raw.githubusercontent.com/Kron4ek/wine-tkg/master/VERSION" | tail -c +14)"
           WINE_BRANCH=vanilla ./build_wine.sh
           WINE_BRANCH=staging ./build_wine.sh